diff --git a/forge/fml-src-1.0.0.57.zip b/forge/fml-src-1.0.0.59.zip similarity index 69% rename from forge/fml-src-1.0.0.57.zip rename to forge/fml-src-1.0.0.59.zip index 7f9af7482..6c376a94d 100644 Binary files a/forge/fml-src-1.0.0.57.zip and b/forge/fml-src-1.0.0.59.zip differ diff --git a/forge/forge_server/src/net/minecraft/src/forge/PacketHandlerServer.java b/forge/forge_server/src/net/minecraft/src/forge/PacketHandlerServer.java index cf87d0dd6..6410fa82e 100644 --- a/forge/forge_server/src/net/minecraft/src/forge/PacketHandlerServer.java +++ b/forge/forge_server/src/net/minecraft/src/forge/PacketHandlerServer.java @@ -10,6 +10,8 @@ import java.util.Arrays; import java.util.List; import java.util.logging.Level; +import cpw.mods.fml.server.FMLServerHandler; + import net.minecraft.server.MinecraftServer; import net.minecraft.src.*; import net.minecraft.src.forge.packets.*; @@ -158,5 +160,6 @@ public class PacketHandlerServer implements IPacketHandler } player.func_20057_k(); + FMLServerHandler.instance().announceLogin(player); } } diff --git a/forge/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch b/forge/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch index 2ca012251..e3db06465 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch @@ -36,13 +36,15 @@ var5.sendPacket(new Packet4UpdateTime(var3.getWorldTime())); Iterator var6 = var2.getActivePotionEffects().iterator(); -@@ -166,7 +173,8 @@ +@@ -166,9 +173,10 @@ } var2.func_20057_k(); -- + */ + ForgeHooksServer.handleLoginPacket(par1Packet1Login, var5, netManager); - FMLServerHandler.instance().handleLogin(par1Packet1Login, netManager, var2); + + FMLServerHandler.instance().handleLogin(par1Packet1Login, netManager); +- FMLServerHandler.instance().announceLogin(var2); } + this.finishedProcessing = true;