keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix CommonHandler for rename of the server thread class

Browse source
This commit is contained in:
Christian 2012-10-20 12:31:35 -04:00
parent 59738c493a
commit 7da5727e3e
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fml/common/cpw/mods/fml/common/FMLCommonHandler.java
View file

@ -18,7 +18,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@ -33,13 +32,12 @@ import net.minecraft.src.NetHandler;
import net.minecraft.src.Packet131MapData; import net.minecraft.src.Packet131MapData;
import net.minecraft.src.SaveHandler; import net.minecraft.src.SaveHandler;
import net.minecraft.src.ServerListenThread; import net.minecraft.src.ServerListenThread;
import net.minecraft.src.ThreadServerApplication; import net.minecraft.src.ThreadMinecraftServer;
import net.minecraft.src.World; import net.minecraft.src.World;
import net.minecraft.src.WorldInfo; import net.minecraft.src.WorldInfo;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@ -176,10 +174,10 @@ public class FMLCommonHandler
public Side getEffectiveSide() public Side getEffectiveSide()
{ {
Thread thr = Thread.currentThread(); Thread thr = Thread.currentThread();
// if ((thr instanceof ThreadServerApplication) || (thr instanceof ServerListenThread)) if ((thr instanceof ThreadMinecraftServer) || (thr instanceof ServerListenThread))
// { {
// return Side.SERVER; return Side.SERVER;
// } }
return Side.CLIENT; return Side.CLIENT;
} }