From 0629748adf427284c959a9b6ba0f202a30f528dc Mon Sep 17 00:00:00 2001
From: Timo Ley <timo@leyt.xyz>
Date: Thu, 30 Apr 2020 13:25:01 +0200
Subject: [PATCH] Fixed crash

---
 src/main/java/anvil/infinity/command/GeneratedCommand.java | 2 +-
 src/main/java/anvil/infinity/compat/HELoadedProxy.java     | 7 +++++++
 src/main/java/anvil/infinity/compat/HENotLoadedProxy.java  | 5 +++++
 src/main/java/anvil/infinity/compat/HEProxy.java           | 2 ++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/anvil/infinity/command/GeneratedCommand.java b/src/main/java/anvil/infinity/command/GeneratedCommand.java
index 4a205d3..2885015 100644
--- a/src/main/java/anvil/infinity/command/GeneratedCommand.java
+++ b/src/main/java/anvil/infinity/command/GeneratedCommand.java
@@ -32,7 +32,7 @@ public class GeneratedCommand extends CommandBase {
         if (sender instanceof EntityLivingBase) {
             locate = Ability.hasAbility((EntityLivingBase) sender, AbilityLocate.class);
             if (CompatHandler.isHeroesExpansion) {
-                locate = locate || SuperpowerHandler.hasSuperpower((EntityLivingBase) sender, HESuperpowers.GOD_OF_THUNDER);
+                locate = locate || CompatHandler.HeroesExpension.canLocate((EntityLivingBase) sender);
             }
         }
         WorldData data = WorldData.get(server.getWorld(0));
diff --git a/src/main/java/anvil/infinity/compat/HELoadedProxy.java b/src/main/java/anvil/infinity/compat/HELoadedProxy.java
index e10ad5c..3c51df3 100644
--- a/src/main/java/anvil/infinity/compat/HELoadedProxy.java
+++ b/src/main/java/anvil/infinity/compat/HELoadedProxy.java
@@ -4,6 +4,8 @@ import lucraft.mods.heroesexpansion.abilities.AbilityBlackHole;
 import lucraft.mods.heroesexpansion.abilities.AbilityForceField;
 import lucraft.mods.heroesexpansion.abilities.AbilityGrabEntity;
 import lucraft.mods.heroesexpansion.abilities.AbilityPortal;
+import lucraft.mods.heroesexpansion.superpowers.HESuperpowers;
+import lucraft.mods.lucraftcore.superpowers.SuperpowerHandler;
 import lucraft.mods.lucraftcore.superpowers.abilities.Ability;
 import net.minecraft.entity.EntityLivingBase;
 
@@ -28,4 +30,9 @@ public class HELoadedProxy implements HEProxy {
     public Ability getAbilityBlackhole(EntityLivingBase entity) {
         return new AbilityBlackHole(entity);
     }
+
+    @Override
+    public boolean canLocate(EntityLivingBase entity) {
+        return SuperpowerHandler.hasSuperpower(entity, HESuperpowers.GOD_OF_THUNDER);
+    }
 }
diff --git a/src/main/java/anvil/infinity/compat/HENotLoadedProxy.java b/src/main/java/anvil/infinity/compat/HENotLoadedProxy.java
index 306de77..f77c1f6 100644
--- a/src/main/java/anvil/infinity/compat/HENotLoadedProxy.java
+++ b/src/main/java/anvil/infinity/compat/HENotLoadedProxy.java
@@ -25,4 +25,9 @@ public class HENotLoadedProxy implements HEProxy {
     public Ability getAbilityBlackhole(EntityLivingBase entity) {
         return null;
     }
+
+    @Override
+    public boolean canLocate(EntityLivingBase entity) {
+        return false;
+    }
 }
diff --git a/src/main/java/anvil/infinity/compat/HEProxy.java b/src/main/java/anvil/infinity/compat/HEProxy.java
index c0ba789..bf383d4 100644
--- a/src/main/java/anvil/infinity/compat/HEProxy.java
+++ b/src/main/java/anvil/infinity/compat/HEProxy.java
@@ -13,4 +13,6 @@ public interface HEProxy {
 
     Ability getAbilityBlackhole(EntityLivingBase entity);
 
+    boolean canLocate(EntityLivingBase entity);
+
 }