Updated FML:

MinecraftForge/FML@23baf3a8ce Actually fix the nethandler code

Update patches
This commit is contained in:
Christian committed 2013-11-13 19:16:24 -05:00
1 parent 745d601831
commit 28abe2cc3c
3 files changed
+8 -8

No files matched your search

+1 -1
Submodule fml updated: da72640c7e...23baf3a8ce.
@@ -21,10 +21,10 @@
this.disconnected = true;
this.mc.loadWorld((WorldClient)null);
@@ -866,7 +871,11 @@
public void handleChat(Packet3Chat par1Packet3Chat)
{
par1Packet3Chat = FMLNetworkHandler.handleChatMessage(this, par1Packet3Chat);
@@ -870,7 +875,11 @@
{
return;
}
- this.mc.ingameGUI.getChatGUI().printChatMessage(ChatMessageComponent.createFromJson(par1Packet3Chat.message).toStringWithFormatting(true));
+ ClientChatReceivedEvent event = new ClientChatReceivedEvent(par1Packet3Chat.message);
+ if (!MinecraftForge.EVENT_BUS.post(event) && event.message != null)
@@ -34,7 +34,7 @@
}
public void handleAnimation(Packet18Animation par1Packet18Animation)
@@ -1354,6 +1363,10 @@
@@ -1358,6 +1367,10 @@
{
tileentity.readFromNBT(par1Packet132TileEntityData.data);
}
@@ -127,7 +127,7 @@
{
this.playerEntity.theItemInWorldManager.activateBlockOrUseItem(this.playerEntity, worldserver, itemstack, i, j, k, l, par1Packet15Place.getXOffset(), par1Packet15Place.getYOffset(), par1Packet15Place.getZOffset());
}
@@ -695,6 +733,8 @@
@@ -698,6 +736,8 @@
}
ChatMessageComponent chatmessagecomponent = ChatMessageComponent.createFromTranslationWithSubstitutions("chat.type.text", new Object[] {this.playerEntity.getTranslatedEntityName(), s});
@@ -136,7 +136,7 @@
this.mcServer.getConfigurationManager().func_110459_a(chatmessagecomponent, false);
}
@@ -849,7 +889,7 @@
@@ -852,7 +892,7 @@
return;
}