Update to 1.9.4 - untested waiting on baubles

This commit is contained in:
Vincent Lee committed 2016-05-18 15:22:35 -05:00
1 parent a59ee11da4
commit 056f46b1f8
306 files changed
+1105 -1102

No files matched your search

@@ -262,7 +262,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile
if (raytraceresult != null)
{
if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && this.worldObj.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.portal)
if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && this.worldObj.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.PORTAL)
{
this.setPortal(raytraceresult.getBlockPos());
}
@@ -342,7 +342,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile
compound.setInteger("xTile", this.xTile);
compound.setInteger("yTile", this.yTile);
compound.setInteger("zTile", this.zTile);
ResourceLocation resourcelocation = (ResourceLocation)Block.blockRegistry.getNameForObject(this.inTile);
ResourceLocation resourcelocation = (ResourceLocation)Block.REGISTRY.getNameForObject(this.inTile);
compound.setString("inTile", resourcelocation == null ? "" : resourcelocation.toString());
compound.setByte("shake", (byte)this.throwableShake);
compound.setByte("inGround", (byte)(this.inGround ? 1 : 0));