From da15affb08cf4f524eff9024d24a40fe88e30ede Mon Sep 17 00:00:00 2001 From: HellFirePvP Date: Sun, 20 Dec 2015 00:36:02 +0100 Subject: [PATCH] - Server crash fixxes --- .../makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java | 5 ++++- .../java/makeo/gadomancy/common/entities/EntityAuraCore.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java index 2d2e8e9..c2219e1 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java @@ -1,5 +1,7 @@ package makeo.gadomancy.common.blocks.tiles; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import makeo.gadomancy.common.entities.EntityPermNoClipItem; import makeo.gadomancy.common.aura.AuraEffectHandler; import makeo.gadomancy.common.utils.NBTHelper; @@ -78,7 +80,7 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont } } else { - if( isInputTile() && holdingAspect != null) { + if(isInputTile() && holdingAspect != null) { doEssentiaTrail(); } } @@ -105,6 +107,7 @@ public class TileAuraPylon extends SynchronizedTileEntity implements IAspectCont } //Client-Side input tile only! + @SideOnly(Side.CLIENT) private void doEssentiaTrail() { if((ticksExisted & 1) == 0) return; TileAuraPylon tile = getMasterTile(); diff --git a/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java b/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java index f77ec77..5dcf86a 100644 --- a/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java +++ b/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java @@ -274,7 +274,10 @@ public class EntityAuraCore extends EntityItem implements IEntityAdditionalSpawn ScanResult result = null; MovingObjectPosition pos = new MovingObjectPosition(x, y, z, ForgeDirection.UP.ordinal(), Vec3.createVectorHelper(0, 0, 0), true); - ItemStack is = block.getPickBlock(pos, worldObj, x, y, z); + ItemStack is = null; + try { + is = block.getPickBlock(pos, worldObj, x, y, z); + } catch (Throwable tr) {} try { if(is == null) { is = BlockUtils.createStackedBlock(block, meta);