From 27587a2a1127f7de55a6cbb192832084b60dbb61 Mon Sep 17 00:00:00 2001 From: Chiss Date: Fri, 19 Sep 2014 11:15:48 +1000 Subject: [PATCH] fixed players being able to be pushed into portals by gadgets --- .../src/mineplex/core/gadget/gadgets/ItemFleshHook.java | 4 ++++ .../src/mineplex/core/gadget/gadgets/MorphCreeper.java | 3 +++ .../src/mineplex/core/gadget/gadgets/MorphPig.java | 3 +++ 3 files changed, 10 insertions(+) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemFleshHook.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemFleshHook.java index 77b5a824c..165f662ed 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemFleshHook.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemFleshHook.java @@ -67,6 +67,10 @@ public class ItemFleshHook extends ItemGadget implements IThrown if (target == null) return; + + if (target instanceof Player) + if (Manager.collideEvent(this, (Player) target)) + return; //Pull UtilAction.velocity(target, diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphCreeper.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphCreeper.java index b6f080700..19876fc6e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphCreeper.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphCreeper.java @@ -110,6 +110,9 @@ public class MorphCreeper extends MorphGadget if (other.equals(player)) continue; + if (Manager.collideEvent(this, other)) + continue; + double mult = players.get(other); //Knockback diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphPig.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphPig.java index 549e2394f..1f54a3fcb 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphPig.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/MorphPig.java @@ -135,6 +135,9 @@ public class MorphPig extends MorphGadget if (UtilMath.offset(player, other) > range) continue; + if (Manager.collideEvent(this, other)) + continue; + //Cooldown Recharge.Instance.useForce(other, GetName() + " Collide", 200); Recharge.Instance.useForce(player, GetName() + " Collide", 200);