Fix mana splitters and manastars loading chunks when placed on a chunk border (probably more cases to fix later)

This commit is contained in:
Vincent Lee committed 2018-01-25 22:01:22 -06:00
1 parent 065ab12af9
commit 7f8c1360ee
2 files changed
+17 -9

No files matched your search

@@ -12,6 +12,7 @@ package vazkii.botania.common.block.subtile;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.api.subtile.SubTileEntity;
@@ -35,9 +36,12 @@ public class SubTileManastar extends SubTileEntity {
} else {
int mana = 0;
for(EnumFacing dir : EnumFacing.HORIZONTALS) {
TileEntity tile = supertile.getWorld().getTileEntity(supertile.getPos().offset(dir));
if(tile instanceof IManaPool)
mana += ((IManaPool) tile).getCurrentMana();
BlockPos pos = supertile.getPos().offset(dir);
if(getWorld().isBlockLoaded(pos)) {
TileEntity tile = supertile.getWorld().getTileEntity(pos);
if(tile instanceof IManaPool)
mana += ((IManaPool) tile).getCurrentMana();
}
}
int newState = mana > lastMana ? INCREASING : mana < lastMana ? DECREASING : NONE;
@@ -13,6 +13,7 @@ package vazkii.botania.common.block.tile.mana;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ITickable;
import net.minecraft.util.math.BlockPos;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.api.mana.IManaReceiver;
@@ -23,7 +24,7 @@ import java.util.List;
public class TileDistributor extends TileMod implements IManaReceiver, ITickable {
final List<IManaReceiver> validPools = new ArrayList<>();
private final List<IManaReceiver> validPools = new ArrayList<>();
@Override
public void update() {
@@ -31,11 +32,14 @@ public class TileDistributor extends TileMod implements IManaReceiver, ITickable
return;
validPools.clear();
for(EnumFacing dir : EnumFacing.HORIZONTALS) {
TileEntity tileAt = world.getTileEntity(pos.offset(dir));
if(tileAt != null && tileAt instanceof IManaPool && !tileAt.isInvalid()) {
IManaReceiver receiver = (IManaReceiver) tileAt;
if(!receiver.isFull())
validPools.add(receiver);
BlockPos pos = this.pos.offset(dir);
if(world.isBlockLoaded(pos)) {
TileEntity tileAt = world.getTileEntity(pos);
if(tileAt instanceof IManaPool && !tileAt.isInvalid()) {
IManaReceiver receiver = (IManaReceiver) tileAt;
if(!receiver.isFull())
validPools.add(receiver);
}
}
}
}