diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2022-09-18 23:44:15 +0800 |
|---|---|---|
| committer | Glease <4586901+Glease@users.noreply.github.com> | 2022-09-18 23:44:15 +0800 |
| commit | 74ffe253aedfee7a62eb5f5be2317e995004007d (patch) | |
| tree | 72649110c4d548b84a47a4b6161a2d7ff5a049db /src/main/java/gregtech/api | |
| parent | adc8ff946c03e1736f43cd35e978ae379c0ec896 (diff) | |
| download | GT5-Unofficial-74ffe253aedfee7a62eb5f5be2317e995004007d.tar.gz GT5-Unofficial-74ffe253aedfee7a62eb5f5be2317e995004007d.tar.bz2 GT5-Unofficial-74ffe253aedfee7a62eb5f5be2317e995004007d.zip | |
fix incorrect code path for legacy survival autoplace
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java index 1f4b6dccc3..32f607c0a7 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java @@ -196,6 +196,7 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta hintOnly); } + @Deprecated protected final int survivialBuildPiece( String piece, ItemStack trigger, @@ -206,15 +207,24 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta IItemSource source, EntityPlayerMP actor, boolean check) { - return survivialBuildPiece( - piece, - trigger, - horizontalOffset, - verticalOffset, - depthOffset, - elementsBudget, - ISurvivalBuildEnvironment.create(source, actor), - check); + final IGregTechTileEntity tTile = getBaseMetaTileEntity(); + return getCastedStructureDefinition() + .survivalBuild( + this, + trigger, + piece, + tTile.getWorld(), + getExtendedFacing(), + tTile.getXCoord(), + tTile.getYCoord(), + tTile.getZCoord(), + horizontalOffset, + verticalOffset, + depthOffset, + elementsBudget, + source, + actor, + check); } protected final int survivialBuildPiece( @@ -245,6 +255,7 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta check); } + @Deprecated protected final int survivialBuildPiece( String piece, ItemStack trigger, @@ -256,16 +267,10 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta EntityPlayerMP actor, boolean check, boolean checkIfPlaced) { - return survivialBuildPiece( - piece, - trigger, - horizontalOffset, - verticalOffset, - depthOffset, - elementsBudget, - ISurvivalBuildEnvironment.create(source, actor), - check, - checkIfPlaced); + int built = survivialBuildPiece( + piece, trigger, horizontalOffset, verticalOffset, depthOffset, elementsBudget, source, actor, check); + if (checkIfPlaced && built > 0) checkStructure(true, getBaseMetaTileEntity()); + return built; } protected final int survivialBuildPiece( |