Merge branch 'v9' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-01-30 00:47:54 +00:00
commit 62e7cc8f65
54 files changed
+992 -344

No files matched your search

@@ -81,7 +81,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench
{
for(EntityPlayer player : playersUsing)
{
Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), (EntityPlayerMP)player);
Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList<Object>())), (EntityPlayerMP)player);
}
}
}
@@ -128,7 +128,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench
@Override
public ArrayList getNetworkedData(ArrayList<Object> data)
{
data.add(facing);
data.add(facing == null ? -1 : facing.ordinal());
data.add(redstone);
for(ITileComponent component : components)
@@ -174,7 +174,7 @@ public abstract class TileEntityBasicBlock extends TileEntity implements IWrench
{
super.writeToNBT(nbtTags);
nbtTags.setInteger("facing", facing.ordinal());
nbtTags.setInteger("facing", facing == null ? -1 : facing.ordinal());
nbtTags.setBoolean("redstone", redstone);
for(ITileComponent component : components)