upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up concurrent modification exception - ticks for players now occur on both sides

Browse Source
This commit is contained in:
Christian committed 2012-08-13 22:55:23 -04:00
1 parent 25256b2295
commit 341041aedb
1 file changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files
common/cpw/mods/fml/common/FMLCommonHandler.java
+5 -2
View File
@@ -39,6 +39,7 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.src.DedicatedServer;
import net.minecraft.src.Entity;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.EntityPlayerMP;
import net.minecraft.src.World;
import com.google.common.base.Strings;
@@ -374,11 +375,13 @@ public class FMLCommonHandler
public void onPlayerPreTick(EntityPlayer player)
{
tickStart(EnumSet.of(TickType.PLAYER), Side.SERVER, player);
Side side = player instanceof EntityPlayerMP ? Side.SERVER : Side.CLIENT;
tickStart(EnumSet.of(TickType.PLAYER), side, player);
}
public void onPlayerPostTick(EntityPlayer player)
{
tickEnd(EnumSet.of(TickType.PLAYER), Side.SERVER, player);
Side side = player instanceof EntityPlayerMP ? Side.SERVER : Side.CLIENT;
tickEnd(EnumSet.of(TickType.PLAYER), side, player);
}
}