Fix API submodule havint the wrong history.

Theoretically fix #3970.
BuildCraft · Jan 10, 2018 · 7dfe9d9 · 7dfe9d9
1 parent 3de2a8e
commit 7dfe9d9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/BuildCraftAPI b/BuildCraftAPI
diff --git a/common/buildcraft/lib/chunkload/ChunkLoaderManager.java b/common/buildcraft/lib/chunkload/ChunkLoaderManager.java
@@ -15,6 +15,7 @@
 import javax.annotation.Nonnull;
 
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.World;
 
@@ -96,9 +97,14 @@ public static <T extends TileEntity & IChunkLoadingTile> void rebindTickets(List
         World world) {
         if (BCLibConfig.chunkLoadingLevel != BCLibConfig.ChunkLoaderLevel.NONE) {
             for (ForgeChunkManager.Ticket ticket : tickets) {
-                TileEntity tile = world.getTileEntity(NBTUtilBC.readBlockPos(ticket.getModData().getTag("location")));
-                if (tile == null || !(tile instanceof IChunkLoadingTile) || !canLoadFor((IChunkLoadingTile) tile))
+                BlockPos pos = NBTUtilBC.readBlockPos(ticket.getModData().getTag("location"));
+                if (pos == null) {
                     continue;
+                }
+                TileEntity tile = world.getTileEntity(pos);
+                if (tile == null || !(tile instanceof IChunkLoadingTile) || !canLoadFor((IChunkLoadingTile) tile)) {
+                    continue;
+                }
                 for (ChunkPos chunkPos : getChunksToLoad((T) tile)) {
                     ForgeChunkManager.forceChunk(ticket, chunkPos);
                 }

diff --git a/common/buildcraft/lib/chunkload/IChunkLoadingTile.java b/common/buildcraft/lib/chunkload/IChunkLoadingTile.java
@@ -9,6 +9,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import javax.annotation.Nullable;
 
 import net.minecraft.tileentity.TileEntity;
@@ -20,7 +21,7 @@
 import buildcraft.lib.BCLibConfig.ChunkLoaderLevel;
 
 /** This should be implemented by {@link TileEntity}'s that wish to be chunkloaded by buildcraft lib. Note that tiles
- * should add themselves to the chunkloading list in {@link ChunkLoaderManager#loadChunksForTile(TileEntity)}  */
+ * should add themselves to the chunkloading list in {@link ChunkLoaderManager#loadChunksForTile(TileEntity)} */
 public interface IChunkLoadingTile {
     /** @return The chunkloading type, or null if this tile doesn't want to be chunkloaded. */
     @Nullable