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

Fix Client/Server issues.

Browse source
This commit is contained in:
Ben Spiers 2014-07-07 23:33:11 +01:00
parent 83ff761ec4
commit 4e32a77ac8
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/mekanism/client/ClientProxy.java
View file

@ -560,6 +560,13 @@ public class ClientProxy extends CommonProxy
@Override @Override
public EntityPlayer getPlayer(MessageContext context) public EntityPlayer getPlayer(MessageContext context)
{ {
return Minecraft.getMinecraft().thePlayer; if(FMLCommonHandler.instance().getEffectiveSide().isServer())
{
return context.getServerHandler().playerEntity;
}
else
{
return Minecraft.getMinecraft().thePlayer;
}
} }
} }

5
src/main/java/mekanism/common/network/PacketDataRequest.java
View file

@ -49,10 +49,7 @@ public class PacketDataRequest implements IMessageHandler<DataRequestMessage, IM
} }
} }
if(player instanceof EntityPlayerMP) Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), ((ITileNetwork)tileEntity).getNetworkedData(new ArrayList())), (EntityPlayerMP)player);
{
Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(tileEntity), ((ITileNetwork)tileEntity).getNetworkedData(new ArrayList())), (EntityPlayerMP)player);
}
} }
return null; return null;