From 2b1c003b620e2383c0186925bfa50ecb2536e98d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 10 Jul 2020 09:04:57 -0500 Subject: [PATCH] Fix tileentity markDirty() methods accessing the world when it may not be available. Fixes #3352 --- .../common/block/tile/TileCraftCrate.java | 4 +++- .../common/block/tile/TileHourglass.java | 2 +- .../common/block/tile/TileIncensePlate.java | 2 +- .../common/block/tile/TileSparkChanger.java | 4 +++- .../common/block/tile/TileTinyPotato.java | 4 +++- .../common/block/tile/mana/TilePrism.java | 2 +- .../common/block/tile/mana/TileSpreader.java | 19 +++++++++++-------- .../block/tile/string/TileRedString.java | 2 +- 8 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 8f8cfc975..77101b0b7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -178,7 +178,9 @@ public class TileCraftCrate extends TileOpenCrate { @Override public void markDirty() { super.markDirty(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); + if (world != null && !world.isRemote) { + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); + } } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index f81bd0221..63b37cd96 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -171,7 +171,7 @@ public class TileHourglass extends TileExposedSimpleInventory implements ITickab @Override public void markDirty() { super.markDirty(); - if (!world.isRemote) { + if (world != null && !world.isRemote) { time = 0; timeFraction = 0F; VanillaPacketDispatcher.dispatchTEToNearbyPlayers(TileHourglass.this); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index d41776b8e..38accbd3c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -175,7 +175,7 @@ public class TileIncensePlate extends TileExposedSimpleInventory implements ISid @Override public void markDirty() { super.markDirty(); - if (!world.isRemote) { + if (world != null && !world.isRemote) { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 71f064450..cbf4328d5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -83,7 +83,9 @@ public class TileSparkChanger extends TileExposedSimpleInventory { @Override public void markDirty() { super.markDirty(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); + if (world != null && !world.isRemote) { + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); + } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index b47252388..c81c55b6c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -115,7 +115,9 @@ public class TileTinyPotato extends TileExposedSimpleInventory implements ITicka @Override public void markDirty() { super.markDirty(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); + if (world != null && !world.isRemote) { + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); + } } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index d7d8094aa..44a0b3f4d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -70,8 +70,8 @@ public class TilePrism extends TileExposedSimpleInventory { @Override public void markDirty() { super.markDirty(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); if (world != null && !world.isRemote) { + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); BlockState state = getBlockState(); boolean hasLens = !getItemHandler().getStackInSlot(0).isEmpty(); if (state.getBlock() != ModBlocks.prism || state.get(BotaniaStateProps.HAS_LENS) != hasLens) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 2e91c5534..59ff15143 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -386,13 +386,12 @@ public class TileSpreader extends TileExposedSimpleInventory implements IManaCol if (!player.isSneaking()) { VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } else { - RayTraceResult pos = Item.rayTrace(world, player, RayTraceContext.FluidMode.ANY); - if (pos instanceof BlockRayTraceResult && !world.isRemote) { - double x = pos.getHitVec().x - getPos().getX() - 0.5; - double y = pos.getHitVec().y - getPos().getY() - 0.5; - double z = pos.getHitVec().z - getPos().getZ() - 0.5; + BlockRayTraceResult bpos = Item.rayTrace(world, player, RayTraceContext.FluidMode.ANY); + if (!world.isRemote) { + double x = bpos.getHitVec().x - getPos().getX() - 0.5; + double y = bpos.getHitVec().y - getPos().getY() - 0.5; + double z = bpos.getHitVec().z - getPos().getZ() - 0.5; - BlockRayTraceResult bpos = (BlockRayTraceResult) pos; if (bpos.getFace() != Direction.DOWN && bpos.getFace() != Direction.UP) { Vector3 clickVector = new Vector3(x, 0, z); Vector3 relative = new Vector3(-0.5, 0, 0); @@ -606,8 +605,12 @@ public class TileSpreader extends TileExposedSimpleInventory implements IManaCol @Override public void markDirty() { - checkForReceiver(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); + if (world != null) { + checkForReceiver(); + if (!world.isRemote) { + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); + } + } } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index d4d50ec0a..e76ec41d6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -92,7 +92,7 @@ public abstract class TileRedString extends TileMod implements ITileBound, ITick public TileEntity getTileAtBinding() { BlockPos binding = getBinding(); - return binding == null ? null : world.getTileEntity(binding); + return binding == null || world == null ? null : world.getTileEntity(binding); } public BlockState getStateAtBinding() {