From 0251691d6626496812acbbde406abc6d9abca32c Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 11 Nov 2015 17:15:47 -0800 Subject: [PATCH] Fix obfuscation conflict with multiblock component isInvalid() --- api/forestry | 2 +- .../core/multiblock/MultiblockControllerBase.java | 12 ++++++++---- .../core/multiblock/MultiblockWorldRegistry.java | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/api/forestry b/api/forestry index d10d230b1..6beb57384 160000 --- a/api/forestry +++ b/api/forestry @@ -1 +1 @@ -Subproject commit d10d230b1a3a6ec51aea622695743557f7a84442 +Subproject commit 6beb5738405eb089ae5e82e3792e0b024e1ff4e8 diff --git a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java index 44eed3471..9e71ec94c 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java +++ b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java @@ -349,7 +349,7 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI for (IMultiblockComponent acquiredPart : partsToAcquire) { // By definition, none of these can be the minimum block. - if (acquiredPart.isInvalid()) { + if (isInvalid(acquiredPart)) { continue; } @@ -653,7 +653,7 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI HashSet deadParts = new HashSet<>(); for (IMultiblockComponent part : connectedParts) { ChunkCoordinates partCoord = part.getCoordinates(); - if (part.isInvalid() || worldObj.getTileEntity(partCoord.posX, partCoord.posY, partCoord.posZ) != part) { + if (isInvalid(part) || worldObj.getTileEntity(partCoord.posX, partCoord.posY, partCoord.posZ) != part) { onDetachBlock(part); deadParts.add(part); } @@ -690,7 +690,7 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI for (IMultiblockComponent part : connectedParts) { // This happens during chunk unload. ChunkCoordinates partCoord = part.getCoordinates(); - if (!chunkProvider.chunkExists(partCoord.posX >> 4, partCoord.posZ >> 4) || part.isInvalid()) { + if (!chunkProvider.chunkExists(partCoord.posX >> 4, partCoord.posZ >> 4) || isInvalid(part)) { deadParts.add(part); onDetachBlock(part); continue; @@ -818,7 +818,7 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI for (IMultiblockComponent part : connectedParts) { ChunkCoordinates partCoord = part.getCoordinates(); - if (part.isInvalid() || !chunkProvider.chunkExists(partCoord.posX >> 4, partCoord.posZ >> 4)) { + if (isInvalid(part) || !chunkProvider.chunkExists(partCoord.posX >> 4, partCoord.posZ >> 4)) { // Chunk is unloading, skip this coord to prevent chunk thrashing continue; } @@ -875,4 +875,8 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI TileEntity saveTe = worldObj.getTileEntity(referenceCoord.posX, referenceCoord.posY, referenceCoord.posZ); worldObj.markTileEntityChunkModified(referenceCoord.posX, referenceCoord.posY, referenceCoord.posZ, saveTe); } + + private static boolean isInvalid(IMultiblockComponent part) { + return part instanceof TileEntity && ((TileEntity) part).isInvalid(); + } } diff --git a/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java b/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java index fc338e875..d4e0a2985 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockWorldRegistry.java @@ -8,6 +8,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; @@ -120,7 +121,7 @@ public class MultiblockWorldRegistry { } // This can occur on slow machines. - if (orphan.isInvalid()) { + if (orphan instanceof TileEntity && ((TileEntity) orphan).isInvalid()) { continue; }