From 8cff3f3676c023c2a957513ab7f6cec5cdfedf90 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 5 Feb 2019 21:06:10 +0200 Subject: [PATCH] Fixed the helper gem's ai --- .../unicopia/spell/SpellDrake.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellDrake.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellDrake.java index 613b39c5..48ef3f6c 100644 --- a/src/main/java/com/minelittlepony/unicopia/spell/SpellDrake.java +++ b/src/main/java/com/minelittlepony/unicopia/spell/SpellDrake.java @@ -67,20 +67,17 @@ public class SpellDrake extends AbstractSpell { } } - if (!source.getWorld().isRemote) { + if (piggyBackSpell == null) { + AxisAlignedBB bb = EFFECT_BOUNDS.offset(source.getOriginVector()); - if (piggyBackSpell == null) { - AxisAlignedBB bb = EFFECT_BOUNDS.offset(source.getOriginVector()); - - source.getWorld().getEntitiesInAABBexcluding(source.getEntity(), bb, e -> e instanceof EntitySpell).stream() - .map(i -> (EntitySpell)i) - .filter(i -> i.hasEffect() && !(i.getEffect() instanceof SpellDrake)) - .findFirst().ifPresent(i -> { - piggyBackSpell = i.getEffect().copy(); - piggyBackSpell.onPlaced(source); - i.setEffect(null); - }); - } + source.getWorld().getEntitiesInAABBexcluding(source.getEntity(), bb, e -> e instanceof EntitySpell).stream() + .map(i -> (EntitySpell)i) + .filter(i -> i.hasEffect() && !(i.getEffect() instanceof SpellDrake)) + .findFirst().ifPresent(i -> { + piggyBackSpell = i.getEffect().copy(); + piggyBackSpell.onPlaced(source); + i.setEffect(null); + }); } if (piggyBackSpell != null) {