From cb6c59d0c795c88f46a68835179b28a5c51244b0 Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Tue, 28 May 2019 16:31:21 +0200 Subject: [PATCH] Snap is able with Speedster Reality Stone --- src/main/java/anvil/infinity/compat/SHLoadedProxy.java | 7 +++++++ src/main/java/anvil/infinity/compat/SHNotLoadedProxy.java | 7 +++++++ src/main/java/anvil/infinity/compat/SHProxy.java | 2 ++ src/main/java/anvil/infinity/helpers/GauntelHelper.java | 3 +++ 4 files changed, 19 insertions(+) diff --git a/src/main/java/anvil/infinity/compat/SHLoadedProxy.java b/src/main/java/anvil/infinity/compat/SHLoadedProxy.java index b833c6e..2785c0f 100644 --- a/src/main/java/anvil/infinity/compat/SHLoadedProxy.java +++ b/src/main/java/anvil/infinity/compat/SHLoadedProxy.java @@ -1,5 +1,6 @@ package anvil.infinity.compat; +import anvil.infinity.abilities.AbilityHasRealityStone; import lucraft.mods.lucraftcore.superpowers.abilities.Ability; import lucraft.mods.speedsterheroes.abilities.AbilityChangeBlocks; import lucraft.mods.speedsterheroes.abilities.AbilitySaveBlock; @@ -22,4 +23,10 @@ public class SHLoadedProxy implements SHProxy { public Ability getAbilityTurnIntoBubbles(EntityLivingBase entity) { return new AbilityTurnIntoBubbles(entity); } + + @Override + public boolean hasRealityStone(EntityLivingBase entity) { + return Ability.hasAbility(entity, AbilityHasRealityStone.class) || Ability.hasAbility(entity, AbilitySaveBlock.class); + } + } diff --git a/src/main/java/anvil/infinity/compat/SHNotLoadedProxy.java b/src/main/java/anvil/infinity/compat/SHNotLoadedProxy.java index 6d7c7e9..6192cc4 100644 --- a/src/main/java/anvil/infinity/compat/SHNotLoadedProxy.java +++ b/src/main/java/anvil/infinity/compat/SHNotLoadedProxy.java @@ -1,5 +1,6 @@ package anvil.infinity.compat; +import anvil.infinity.abilities.AbilityHasRealityStone; import lucraft.mods.lucraftcore.superpowers.abilities.Ability; import net.minecraft.entity.EntityLivingBase; @@ -19,4 +20,10 @@ public class SHNotLoadedProxy implements SHProxy { public Ability getAbilityTurnIntoBubbles(EntityLivingBase entity) { return null; } + + + @Override + public boolean hasRealityStone(EntityLivingBase entity) { + return Ability.hasAbility(entity, AbilityHasRealityStone.class); + } } diff --git a/src/main/java/anvil/infinity/compat/SHProxy.java b/src/main/java/anvil/infinity/compat/SHProxy.java index 9fca504..ae7222c 100644 --- a/src/main/java/anvil/infinity/compat/SHProxy.java +++ b/src/main/java/anvil/infinity/compat/SHProxy.java @@ -11,4 +11,6 @@ public interface SHProxy { Ability getAbilityTurnIntoBubbles(EntityLivingBase entity); + boolean hasRealityStone(EntityLivingBase entity); + } diff --git a/src/main/java/anvil/infinity/helpers/GauntelHelper.java b/src/main/java/anvil/infinity/helpers/GauntelHelper.java index fb91868..4394094 100644 --- a/src/main/java/anvil/infinity/helpers/GauntelHelper.java +++ b/src/main/java/anvil/infinity/helpers/GauntelHelper.java @@ -16,6 +16,9 @@ public class GauntelHelper { } public static boolean hasRealityStone(EntityLivingBase entity) { + if (CompatHandler.isSpeedsterHeroes) { + return CompatHandler.SpeedsterHeroes.hasRealityStone(entity); + } return Ability.hasAbility(entity, AbilityHasRealityStone.class); }