From 784dde9caac018fcc8c80f8d4b57ab19cb27b619 Mon Sep 17 00:00:00 2001 From: MachineMuse Date: Mon, 7 Sep 2015 23:40:34 -0600 Subject: [PATCH] Plasma bolts will no longer hit the shooter. Ever. --- .../net/machinemuse/powersuits/entity/EntityPlasmaBolt.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/net/machinemuse/powersuits/entity/EntityPlasmaBolt.java b/src/main/scala/net/machinemuse/powersuits/entity/EntityPlasmaBolt.java index 08d5fa4..52d8f56 100644 --- a/src/main/scala/net/machinemuse/powersuits/entity/EntityPlasmaBolt.java +++ b/src/main/scala/net/machinemuse/powersuits/entity/EntityPlasmaBolt.java @@ -127,7 +127,7 @@ public class EntityPlasmaBolt extends EntityThrowable { double damage = this.size / 50.0 * this.damagingness; switch (event.typeOfHit) { case ENTITY: - if (event.entityHit != null) { + if (event.entityHit != null && event.entityHit != shootingEntity) { event.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.shootingEntity), (int) damage); } break;