keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge branch '1.6.4'

This commit is contained in:
Christian 2013-11-13 07:55:12 -05:00
parent b8ece10f0b 56c9c3c77f
commit 90e3b49ea5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fml/src/main/java/cpw/mods/fml/common/network/FMLNetworkHandler.java
View File

@ -49,6 +49,7 @@ import cpw.mods.fml.common.network.FMLPacket.Type;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
import cpw.mods.fml.relauncher.Side;
public class FMLNetworkHandler
{
@ -351,10 +352,14 @@ public class FMLNetworkHandler
{
NetworkRegistry.instance().openRemoteGui(mc, (EntityPlayerMP) player, modGuiId, world, x, y, z);
}
else
else if (FMLCommonHandler.instance().getSide().equals(Side.CLIENT))
{
NetworkRegistry.instance().openLocalGui(mc, player, modGuiId, world, x, y, z);
}
else
{
FMLLog.fine("Invalid attempt to open a local GUI on a dedicated server. This is likely a bug. GUIID: %s,%d", mc.getModId(), modGuiId);
}
}
public static Packet getEntitySpawningPacket(Entity entity)