From 8f6883da8e0f1ca60e277e45cb2aa7eb65ec4567 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 22 Aug 2012 17:58:46 -0400 Subject: [PATCH] Tweak patches and hooks slightly --- .../mods/fml/common/network/FMLNetworkHandler.java | 2 ++ .../src/ServerConfigurationManager.java.patch | 13 ++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java b/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java index 80a9901982..687ebc43c5 100644 --- a/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java +++ b/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java @@ -32,6 +32,7 @@ import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.discovery.ASMDataTable; import cpw.mods.fml.common.network.FMLPacket.Type; import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; public class FMLNetworkHandler @@ -246,6 +247,7 @@ public class FMLNetworkHandler public static void handlePlayerLogin(EntityPlayerMP player, NetServerHandler netHandler, NetworkManager manager) { NetworkRegistry.instance().playerLoggedIn(player, netHandler, manager); + GameRegistry.onPlayerLogin(player); } public Map getNetworkIdMap() diff --git a/fml/patches/common/net/minecraft/src/ServerConfigurationManager.java.patch b/fml/patches/common/net/minecraft/src/ServerConfigurationManager.java.patch index e99e49e40a..5dce1c86d9 100644 --- a/fml/patches/common/net/minecraft/src/ServerConfigurationManager.java.patch +++ b/fml/patches/common/net/minecraft/src/ServerConfigurationManager.java.patch @@ -11,16 +11,15 @@ import net.minecraft.server.MinecraftServer; public abstract class ServerConfigurationManager -@@ -80,6 +84,8 @@ +@@ -80,6 +84,7 @@ } p_72355_2_.func_71116_b(); -+ FMLNetworkHandler.handlePlayerLogin(p_72355_2_, var6, p_72355_1_); -+ GameRegistry.onPlayerLogin(p_72355_2_); ++ FMLNetworkHandler.handlePlayerLogin(p_72355_2_, var6, p_72355_1_); } public void func_72364_a(WorldServer[] p_72364_1_) -@@ -153,6 +159,7 @@ +@@ -153,6 +158,7 @@ public void func_72367_e(EntityPlayerMP p_72367_1_) { @@ -28,7 +27,7 @@ this.func_72391_b(p_72367_1_); WorldServer var2 = p_72367_1_.func_71121_q(); var2.func_72900_e(p_72367_1_); -@@ -301,6 +308,7 @@ +@@ -301,6 +307,7 @@ var7.func_72838_d(var6); this.field_72404_b.add(var6); var6.func_71116_b(); @@ -36,11 +35,11 @@ return var6; } -@@ -380,6 +388,8 @@ +@@ -380,6 +387,8 @@ PotionEffect var13 = (PotionEffect)var14.next(); p_72356_1_.field_71135_a.func_72567_b(new Packet41EntityEffect(p_72356_1_.field_70157_k, var13)); } -+ ++ + GameRegistry.onPlayerChangedDimension(p_72356_1_); }