From 1c75d4f648a69a5b0d3dac1dfebabc41b4b250a7 Mon Sep 17 00:00:00 2001
From: WayofTime <wtime@live.ca>
Date: Sat, 2 Jan 2016 18:52:45 -0500
Subject: [PATCH] Fixed Sided issue in PlayerHelper - caused crashes in SMP.

---
 .../WayofTime/bloodmagic/api/util/helper/PlayerHelper.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java
index b9d2eeeb..64f9e55c 100644
--- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java
+++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerHelper.java
@@ -1,7 +1,9 @@
 package WayofTime.bloodmagic.api.util.helper;
 
 import WayofTime.bloodmagic.api.Constants;
+
 import com.google.common.base.Strings;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
@@ -9,6 +11,8 @@ import net.minecraft.potion.PotionEffect;
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.common.UsernameCache;
 import net.minecraftforge.common.util.FakePlayer;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.relauncher.Side;
 
 import java.util.UUID;
 import java.util.regex.Pattern;
@@ -24,7 +28,7 @@ public class PlayerHelper
 
     public static EntityPlayer getPlayerFromUsername(String username)
     {
-        if (MinecraftServer.getServer() == null)
+        if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
             return null;
 
         return MinecraftServer.getServer().getConfigurationManager().getPlayerByUsername(username);