From 4ac408dc3e2b3ca5520ec72e7a3b0113a5125ae4 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Thu, 30 Apr 2015 14:30:19 +0100 Subject: [PATCH] Fixed the Force Relay not properly saving to the world's data if not pushed by a piston. Closes #835 --- .../botania/common/block/BlockPistonRelay.java | 15 ++++++++++++--- .../vazkii/botania/common/item/ItemTwigWand.java | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 697a95749..f7fe11be2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -144,6 +144,11 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl public void onWorldLoad(WorldEvent.Load event) { WorldData.get(event.world); } + + @SubscribeEvent + public void onWorldUnload(WorldEvent.Unload event) { + WorldData.get(event.world).markDirty(); + } public static class WorldData extends WorldSavedData { @@ -245,9 +250,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl pos = mappedPositions.get(s); mappedPositions.remove(s); mappedPositions.put(newPos, pos); - WorldData data = WorldData.get(world); - if(data != null) - data.markDirty(); + save(world); } } } @@ -263,6 +266,12 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl removeThese.clear(); } + public void save(World world) { + WorldData data = WorldData.get(world); + if(data != null) + data.markDirty(); + } + @Override public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { return LexiconData.pistonRelay; diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index ec1c5da91..0c202adde 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -153,7 +153,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } return wanded; - } else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getCommandSenderName())) { + } else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getCommandSenderName()) && !par3World.isRemote) { String bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getCommandSenderName()); String currentPos = BlockPistonRelay.getCoordsAsString(par3World.provider.dimensionId, par4, par5, par6);