$ Fixed #169.

2 files changed, 11 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 6d28dd3662..c989ece8ea 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -1,14 +1,16 @@
 package gtPlusPlus;
 
 import static gtPlusPlus.core.lib.CORE.DEBUG;
-import static gtPlusPlus.core.lib.CORE.ConfigSwitches.*;
+import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes;
+import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableUpdateChecker;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Collection;
 
-import cpw.mods.fml.common.*;
+import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
+import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.*;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion;
 import cpw.mods.fml.relauncher.Side;
@@ -184,7 +186,7 @@ public class GTplusplus implements ActionListener {
 
 	private static final void initAnalytics(){
 		SegmentAnalytics.isEnabled = CORE.ConfigSwitches.enableUpdateChecker;
-		if (PlayerUtils.isPlayerAlkalus()){
+		if (!Utils.isServer() && PlayerUtils.isPlayerAlkalus()){
 			SegmentAnalytics.isEnabled = true;
 		}
 		
diff --git a/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java b/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java
index 82de626976..306e3ca6b5 100644
--- a/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java
+++ b/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java
@@ -1,12 +1,10 @@
 package gtPlusPlus.core.util.player;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.core.util.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -157,7 +155,11 @@ public class PlayerUtils {
 		return null;
 	}
 	
+	@SideOnly(Side.CLIENT)
 	public static final boolean isPlayerAlkalus(){
+		if (Utils.isServer()){
+			return false;
+		}
 		return isPlayerAlkalus(Minecraft.getMinecraft().thePlayer);
 	}