From 341041aedb20f42cb9576ccda69c34a67ccbac46 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 13 Aug 2012 22:55:23 -0400 Subject: [PATCH] Fix up concurrent modification exception - ticks for players now occur on both sides --- common/cpw/mods/fml/common/FMLCommonHandler.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common/cpw/mods/fml/common/FMLCommonHandler.java b/common/cpw/mods/fml/common/FMLCommonHandler.java index ff484d69ae..9d0a5bd7e1 100644 --- a/common/cpw/mods/fml/common/FMLCommonHandler.java +++ b/common/cpw/mods/fml/common/FMLCommonHandler.java @@ -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); } }