fixed players being able to be pushed into portals by gadgets

This commit is contained in:
Chiss 2014-09-19 11:15:48 +10:00
parent a0e9d6f6fd
commit 27587a2a11
3 changed files with 10 additions and 0 deletions

View File

@ -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,

View File

@ -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

View File

@ -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);