Anvilcraft/ModularPowersuits
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Plasma bolts will no longer hit the shooter. Ever.

Browse source
This commit is contained in:
MachineMuse 2015-09-07 23:40:34 -06:00
parent 24d220d532
commit 784dde9caa
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/scala/net/machinemuse/powersuits/entity/EntityPlasmaBolt.java
View file

@ -127,7 +127,7 @@ public class EntityPlasmaBolt extends EntityThrowable {
double damage = this.size / 50.0 * this.damagingness; double damage = this.size / 50.0 * this.damagingness;
switch (event.typeOfHit) { switch (event.typeOfHit) {
case ENTITY: case ENTITY:
if (event.entityHit != null) { if (event.entityHit != null && event.entityHit != shootingEntity) {
event.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.shootingEntity), (int) damage); event.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.shootingEntity), (int) damage);
} }
break; break;