Update FML: 12bc4ba

12bc4ba Make console logging pass through a single logging thread to avoid concurrency problems with launchers and stuff
8fccfa2 Overlooked chat message support *sigh*. Fixes wierd mods that communicate through custom chat messages rather than
a697d04 Rescan mod packages where there was a possible mod identified to try and make sure we load it. Fixes Matmos r16
This commit is contained in:
Christian 2012-09-04 19:24:48 -04:00
parent 793579f4f2
commit c4852b02c3
2 changed files with 6 additions and 6 deletions

View file

@ -21,10 +21,10 @@
this.field_72554_f = true;
this.mc.loadWorld((WorldClient)null);
this.mc.displayGuiScreen(new GuiDisconnected("disconnect.disconnected", "disconnect.genericReason", new Object[] {par1Packet255KickDisconnect.reason}));
@@ -655,7 +660,11 @@
@@ -656,7 +661,11 @@
public void handleChat(Packet3Chat par1Packet3Chat)
{
par1Packet3Chat = FMLNetworkHandler.handleChatMessage(this, par1Packet3Chat);
- this.mc.ingameGUI.getChatGUI().printChatMessage(par1Packet3Chat.message);
+ ClientChatReceivedEvent event = new ClientChatReceivedEvent(par1Packet3Chat.message);
+ if (!MinecraftForge.EVENT_BUS.post(event) && event.message != null)
@ -34,7 +34,7 @@
}
public void handleAnimation(Packet18Animation par1Packet18Animation)
@@ -1010,6 +1019,19 @@
@@ -1011,6 +1020,19 @@
{
((TileEntityMobSpawner)var2).readFromNBT(par1Packet132TileEntityData.customParam1);
}
@ -42,13 +42,13 @@
+ {
+ var2.onDataPacket(netManager, par1Packet132TileEntityData);
+ }
+ else
+ else
+ {
+ /*Packet132TileEntityData pkt = par1Packet132TileEntityData;
+ ModLoader.getLogger().log(Level.WARNING, String.format(
+ "Received a TileEntityData packet for a location that did not have a TileEntity: (%d, %d, %d) %d: %d, %d, %d",
+ "Received a TileEntityData packet for a location that did not have a TileEntity: (%d, %d, %d) %d: %d, %d, %d",
+ pkt.xPosition, pkt.yPosition, pkt.zPosition,
+ pkt.actionType,
+ pkt.actionType,
+ pkt.customParam1, pkt.customParam2, pkt.customParam3));*/
+ }
}