- Server crash fixxes

This commit is contained in:
HellFirePvP committed 2015-12-20 00:36:02 +01:00
1 parent b681d6a8ae
commit da15affb08
2 files changed
+8 -2

No files matched your search

@@ -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();
@@ -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);