fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add disintegrate animation, plus misc tweaks to disintegration

Browse Source
This commit is contained in:
Electroblob77
2020-06-05 17:11:19 +01:00
parent ce92d564f4
commit a54f00875f
24 changed files with 106 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/entity/projectile/EntityEmber.java
+5 -4
View File
@@ -39,9 +39,9 @@ public class EntityEmber extends EntityMagicProjectile {
@Override
protected void onImpact(RayTraceResult result){
if(result.entityHit != null){
result.entityHit.setFire(Spells.disintegration.getProperty(Spell.BURN_DURATION).intValue());
}
// if(result.entityHit != null){
// result.entityHit.setFire(Spells.disintegration.getProperty(Spell.BURN_DURATION).intValue());
// }
if(result.typeOfHit == RayTraceResult.Type.BLOCK){
this.inGround = true;
@@ -60,7 +60,7 @@ public class EntityEmber extends EntityMagicProjectile {
super.applyEntityCollision(entity);
if(entity instanceof EntityLivingBase){
if(entity instanceof EntityLivingBase && ((EntityLivingBase)entity).getHealth() > 0){
entity.setFire(Spells.disintegration.getProperty(Spell.BURN_DURATION).intValue());
}
}
@@ -77,6 +77,7 @@ public class EntityEmber extends EntityMagicProjectile {
}
world.getEntitiesInAABBexcluding(thrower, this.getEntityBoundingBox(), e -> e instanceof EntityLivingBase)
.stream().filter(e -> !(e instanceof EntityLivingBase) || ((EntityLivingBase)e).getHealth() > 0)
.forEach(e -> e.setFire(Spells.disintegration.getProperty(Spell.BURN_DURATION).intValue()));
// Copied from ParticleLava