upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
LexManos committed 2012-08-13 21:05:14 -07:00
2 parents bbcdaa7dfb 6f10295936
commit 908227ce0c
2 files changed
+1 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fml/build.xml
-2
View File
@@ -97,8 +97,6 @@
<condition>
<not>
<and>
<available file="${mcp.home}/temp/server.md5"/>
<available file="${mcp.home}/temp/server_reobf.md5"/>
<available file="${mcp.home}/temp/client.md5"/>
<available file="${mcp.home}/temp/client_reobf.md5"/>
</and>
fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
+1 -1
View File
@@ -318,7 +318,7 @@ public class FMLNetworkHandler
}
Packet250CustomPayload pkt = new Packet250CustomPayload();
pkt.field_73630_a = "FML";
pkt.field_73629_c = FMLPacket.makePacket(Type.ENTITYSPAWN, er, entity);
pkt.field_73629_c = FMLPacket.makePacket(Type.ENTITYSPAWN, er, entity, instance().findNetworkModHandler(er.getContainer()));
pkt.field_73628_b = pkt.field_73629_c.length;
return pkt;
}