A major load of fixes - things should be about back to normal now.

This commit is contained in:
Aidan C. Brady committed 2014-06-03 19:54:45 +02:00
1 parent 322301c301
commit 815944c49a
38 files changed
+114 -93

No files matched your search

@@ -131,10 +131,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -477,6 +479,9 @@ public class ClientProxy extends CommonProxy
public void loadUtilities()
{
super.loadUtilities();
FMLCommonHandler.instance().bus().register(new ClientConnectionHandler());
FMLCommonHandler.instance().bus().register(new ClientPlayerTracker());
HolidayManager.init();
}
@@ -552,7 +557,7 @@ public class ClientProxy extends CommonProxy
{
super.onConfigSync();
if(Mekanism.voiceServerEnabled)
if(Mekanism.voiceServerEnabled && MekanismClient.voiceClient != null)
{
MekanismClient.voiceClient.start();
}