upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CommonHandler for rename of the server thread class

Browse Source
This commit is contained in:
Christian committed 2012-10-20 12:31:35 -04:00
1 parent 4d1ec666dd
commit 4a0bfa937a
1 file changed
+5 -7
Download Patch File Download Diff File Expand all files Collapse all files
common/cpw/mods/fml/common/FMLCommonHandler.java
+5 -7
View File
@@ -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;
}