tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge branch 'master' of https://github.com/aidancbrady/Mekanism

Browse source
This commit is contained in:
Calclavia 2013-11-20 20:28:06 +08:00
commit 132dcef0f6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/common/item/ItemBlockMachine.java
View file

@ -252,7 +252,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem
{
if(isElectricChest(itemstack))
{
if(!world.isRemote)
if(world != null && !world.isRemote)
{
InventoryElectricChest inv = new InventoryElectricChest(itemstack);

2
common/mekanism/induction/client/gui/GuiMultimeter.java
View file

@ -66,7 +66,7 @@ public class GuiMultimeter extends GuiContainer
data.add((byte)3);
data.add(Float.parseFloat(textFieldLimit.getText()));
PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity)), data);
PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity), data));
}
@Override