lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

no idea why I didn't put it before the switch statement to begin with; (#1538)

Browse source 
that would just have been too logical

#1537
This commit is contained in:
Tobias Gremeyer 2019-02-11 02:29:57 +01:00 committed by Nick Ignoffo
parent 8e2a93fa34
commit 77ca407630
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java
View file

@ -168,6 +168,18 @@ public class EntitySentientArrow extends EntityTippedArrow {
@Override @Override
public void onUpdate() { public void onUpdate() {
super.onUpdate(); super.onUpdate();
if (this.specialArrowClass != null) {
if (!this.world.isRemote) {
this.specialEntity.posX = this.posX;
this.specialEntity.posY = this.posY;
this.specialEntity.posZ = this.posZ;
this.specialEntity.onUpdate();
if (this.inGround) {
this.specialEntity.setDead();
}
}
}
switch (type) { switch (type) {
case DESTRUCTIVE: case DESTRUCTIVE:
if (this.potion != null) { if (this.potion != null) {
@ -177,8 +189,8 @@ public class EntitySentientArrow extends EntityTippedArrow {
this.world.createExplosion(this, this.posX, this.posY, this.posZ, currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0, false); this.world.createExplosion(this, this.posX, this.posY, this.posZ, currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0, false);
if (this.potion != null && this.specialArrowClass == null) { if (this.potion != null && this.specialArrowClass == null) {
createPotionFromArrow(null); createPotionFromArrow(null);
this.setDead();
} }
this.setDead();
} }
break; break;
case CORROSIVE: case CORROSIVE:
@ -204,19 +216,7 @@ public class EntitySentientArrow extends EntityTippedArrow {
break; break;
} }
if (this.specialArrowClass != null) {
if (!this.world.isRemote) {
this.specialEntity.posX = this.posX;
this.specialEntity.posY = this.posY;
this.specialEntity.posZ = this.posZ;
this.specialEntity.onUpdate();
if (this.inGround) {
this.setDead();
this.specialEntity.setDead();
}
}
}
} }
//TODO: Potion splash (for destructive will fired tipped arrows) currently does not have a visual effect. //TODO: Potion splash (for destructive will fired tipped arrows) currently does not have a visual effect.