From 2b411ce4cf7cd66b5f48b3875a61318efaa6d54a Mon Sep 17 00:00:00 2001 From: Steve Date: Sat, 27 Jun 2015 19:33:38 -0700 Subject: [PATCH] Fix crash on exiting personal pocket dimension -changed unload() function to tryunload() to quiet shutdown error messages. If using unload() was intentional, don't do this. --- .../java/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java | 6 +++++- .../java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java index 1409227b..03b74984 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java @@ -349,7 +349,11 @@ public class BlockRift extends Block implements ITileEntityProvider // is designed to receive an entity, the source of the blast. We have no entity so // I've set this to access blockResistance directly. Might need changing later. - return (block.blockResistance >= MIN_IMMUNE_RESISTANCE || + //notabadminer: block.getExplosionResistance() doesn't do anything with the entity passed to it + //so passing null is fine. Just do it. Also, it returns resistance/5 so we should *5 to get + //back to the resistance value. + + return (block.getExplosionResistance(null) * 5 >= MIN_IMMUNE_RESISTANCE || modBlocksImmuneToRift.contains(block) || blocksImmuneToRift.contains(block)); } diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java index d5544ace..856fee5e 100644 --- a/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java +++ b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java @@ -317,7 +317,7 @@ public class mod_pocketDim { try { - PocketManager.unload(); + PocketManager.tryUnload(); deathTracker.writeToFile(); deathTracker = null; worldProperties = null;