mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 19:49:54 +00:00
Fix obfuscation conflict with multiblock component isInvalid()
This commit is contained in:
1 parent
d4cd0aaf7e
commit
0251691d66
3 files changed
+11
-6
No files matched your search
@@ -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<IMultiblockComponent> 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();
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user