From 28abe2cc3ce3001f1795146cfc47f0a6daf65a93 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 13 Nov 2013 19:14:56 -0500 Subject: [PATCH] Updated FML: MinecraftForge/FML@23baf3a8ce58cb8306189401a60647957ccbb4c2 Actually fix the nethandler code Update patches --- fml | 2 +- .../client/multiplayer/NetClientHandler.java.patch | 10 +++++----- .../net/minecraft/network/NetServerHandler.java.patch | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fml b/fml index da72640c7e..23baf3a8ce 160000 --- a/fml +++ b/fml @@ -1 +1 @@ -Subproject commit da72640c7ef1f44c49f7f592fbdd193622a30b40 +Subproject commit 23baf3a8ce58cb8306189401a60647957ccbb4c2 diff --git a/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch b/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch index 0ef9b480ac..63a9622488 100644 --- a/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch +++ b/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch @@ -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); } diff --git a/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch b/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch index d28a430214..7e6a1554fd 100644 --- a/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch +++ b/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch @@ -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; }