From 4a0bfa937a1d6fe99ddf6f80ba7b43a9aceb49c0 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 20 Oct 2012 12:31:35 -0400 Subject: [PATCH] Fix CommonHandler for rename of the server thread class --- common/cpw/mods/fml/common/FMLCommonHandler.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/common/cpw/mods/fml/common/FMLCommonHandler.java b/common/cpw/mods/fml/common/FMLCommonHandler.java index 8502efa25f..c04bb89da8 100644 --- a/common/cpw/mods/fml/common/FMLCommonHandler.java +++ b/common/cpw/mods/fml/common/FMLCommonHandler.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.logging.Level; import java.util.logging.Logger; import net.minecraft.server.MinecraftServer; @@ -33,13 +32,12 @@ import net.minecraft.src.NetHandler; import net.minecraft.src.Packet131MapData; import net.minecraft.src.SaveHandler; import net.minecraft.src.ServerListenThread; -import net.minecraft.src.ThreadServerApplication; +import net.minecraft.src.ThreadMinecraftServer; import net.minecraft.src.World; import net.minecraft.src.WorldInfo; import com.google.common.base.Objects; import com.google.common.base.Strings; -import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.Lists; @@ -176,10 +174,10 @@ public class FMLCommonHandler public Side getEffectiveSide() { Thread thr = Thread.currentThread(); -// if ((thr instanceof ThreadServerApplication) || (thr instanceof ServerListenThread)) -// { -// return Side.SERVER; -// } + if ((thr instanceof ThreadMinecraftServer) || (thr instanceof ServerListenThread)) + { + return Side.SERVER; + } return Side.CLIENT; }