From d287b30c010378c9292b152b2b58d95a3789d578 Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Mon, 16 Jun 2014 22:43:41 -0500 Subject: [PATCH 1/2] Fixed http://openeye.openmods.info/crashes/2d45b58c95514ec3d9a1b49703e53de9 --- block/solids/BlockSkyStone.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/block/solids/BlockSkyStone.java b/block/solids/BlockSkyStone.java index 1da657dd..8f4e9aac 100644 --- a/block/solids/BlockSkyStone.java +++ b/block/solids/BlockSkyStone.java @@ -26,6 +26,7 @@ import appeng.core.features.AEFeature; import appeng.helpers.LocationRotation; import appeng.helpers.NullRotation; import appeng.integration.abstraction.IRB; +import appeng.util.Platform; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -161,14 +162,16 @@ public class BlockSkyStone extends AEBaseBlock implements IOrientableBlock public void onBlockAdded(World w, int x, int y, int z) { super.onBlockAdded( w, x, y, z ); - WorldSettings.getInstance().getCompass().updateArea( w, x, y, z ); + if ( Platform.isServer() ) + WorldSettings.getInstance().getCompass().updateArea( w, x, y, z ); } @Override public void breakBlock(World w, int x, int y, int z, Block b, int WTF) { super.breakBlock( w, x, y, z, b, WTF ); - WorldSettings.getInstance().getCompass().updateArea( w, x, y, z ); + if ( Platform.isServer() ) + WorldSettings.getInstance().getCompass().updateArea( w, x, y, z ); } // use AE2's enderer, no rotatable blocks. From ba27380edfca36a72fd1ae69b3db3ff3aa2bfbeb Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Mon, 16 Jun 2014 22:44:17 -0500 Subject: [PATCH 2/2] Fixed Bug: #0500 - Craftable Invalid Items --- recipes/AEItemResolver.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/AEItemResolver.java b/recipes/AEItemResolver.java index 5155a4ba..fdb0f7d0 100644 --- a/recipes/AEItemResolver.java +++ b/recipes/AEItemResolver.java @@ -78,8 +78,8 @@ public class AEItemResolver implements ISubItemResolver { String materialName = itemName.substring( itemName.indexOf( "." ) + 1 ); MaterialType mt = MaterialType.valueOf( materialName ); - //itemName = itemName.substring( 0, itemName.indexOf( "." ) ); - if ( mt.damageValue >= 0 ) + // itemName = itemName.substring( 0, itemName.indexOf( "." ) ); + if ( mt.damageValue >= 0 && mt.isRegistered() ) return new ResolverResult( "ItemMultiMaterial", mt.damageValue ); } @@ -87,7 +87,7 @@ public class AEItemResolver implements ISubItemResolver { String partName = itemName.substring( itemName.indexOf( "." ) + 1 ); PartType pt = PartType.valueOf( partName ); - //itemName = itemName.substring( 0, itemName.indexOf( "." ) ); + // itemName = itemName.substring( 0, itemName.indexOf( "." ) ); int dVal = ItemMultiPart.instance.getDamageByType( pt ); if ( dVal >= 0 ) return new ResolverResult( "ItemMultiPart", dVal );