Merge branch 'development' into 1.8

This commit is contained in:
Aidan C. Brady 2014-07-17 01:44:54 -04:00
commit c9f569fd4a

View file

@ -9,10 +9,12 @@ import java.util.Set;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.ChunkEvent;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.event.world.ChunkEvent;
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
import cpw.mods.fml.relauncher.Side;
public class TransmitterNetworkRegistry
{
@ -66,7 +68,10 @@ public class TransmitterNetworkRegistry
@SubscribeEvent
public void onTick(ServerTickEvent event)
{
tickEnd();
if(event.phase == Phase.END && event.side == Side.SERVER)
{
tickEnd();
}
}
public void tickEnd()