From 663d37a6027e314e13aa286d90a5d05bac267d1f Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Wed, 30 Jan 2019 22:17:09 +0200
Subject: [PATCH] Fixed crash when logging in (maybe?)

---
 src/main/java/com/minelittlepony/unicopia/UClient.java    | 5 +++++
 .../java/com/minelittlepony/unicopia/player/IPlayer.java  | 5 ++++-
 .../unicopia/player/PlayerCapabilities.java               | 8 --------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/UClient.java b/src/main/java/com/minelittlepony/unicopia/UClient.java
index 430220bd..d4633a3c 100644
--- a/src/main/java/com/minelittlepony/unicopia/UClient.java
+++ b/src/main/java/com/minelittlepony/unicopia/UClient.java
@@ -43,6 +43,11 @@ public class UClient {
         return null;
     }
 
+    @FUF(reason = "Forced client Separation")
+    public boolean isClientPlayer(@Nullable EntityPlayer player) {
+        return false;
+    }
+
     public void preInit(FMLPreInitializationEvent event) {}
 
     public void init(FMLInitializationEvent event) {}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/IPlayer.java b/src/main/java/com/minelittlepony/unicopia/player/IPlayer.java
index c7296026..f45ae0e4 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/IPlayer.java
+++ b/src/main/java/com/minelittlepony/unicopia/player/IPlayer.java
@@ -3,6 +3,7 @@ package com.minelittlepony.unicopia.player;
 import java.util.UUID;
 
 import com.minelittlepony.model.anim.IInterpolator;
+import com.minelittlepony.unicopia.UClient;
 import com.minelittlepony.unicopia.enchanting.IPageOwner;
 import com.minelittlepony.unicopia.network.ITransmittable;
 import com.minelittlepony.unicopia.spell.ICaster;
@@ -38,7 +39,9 @@ public interface IPlayer extends ICaster<EntityPlayer>, IRaceContainer<EntityPla
         setEnergy(getEnergy() + energy / 100F);
     }
 
-    boolean isClientPlayer();
+    default boolean isClientPlayer() {
+        return UClient.instance().isClientPlayer(getOwner());
+    }
 
     void copyFrom(IPlayer oldPlayer);
 
diff --git a/src/main/java/com/minelittlepony/unicopia/player/PlayerCapabilities.java b/src/main/java/com/minelittlepony/unicopia/player/PlayerCapabilities.java
index cdd7b4a4..c1eab713 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/PlayerCapabilities.java
+++ b/src/main/java/com/minelittlepony/unicopia/player/PlayerCapabilities.java
@@ -8,7 +8,6 @@ import com.google.common.collect.Lists;
 import com.minelittlepony.model.anim.BasicEasingInterpolator;
 import com.minelittlepony.model.anim.IInterpolator;
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.UClient;
 import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.network.EffectSync;
 import com.minelittlepony.unicopia.network.MsgPlayerCapabilities;
@@ -16,7 +15,6 @@ import com.minelittlepony.unicopia.spell.IMagicEffect;
 import com.minelittlepony.unicopia.spell.SpellAffinity;
 import com.minelittlepony.unicopia.spell.SpellRegistry;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -159,12 +157,6 @@ class PlayerCapabilities implements IPlayer {
         return interpolator;
     }
 
-    @Override
-    public boolean isClientPlayer() {
-        return UClient.isClientSide() &&
-                Minecraft.getMinecraft().player.getGameProfile().getId().equals(getOwner().getGameProfile().getId());
-    }
-
     @Override
     public void beforeUpdate(EntityPlayer entity) {
         if (entity.world.isRemote) {