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

Reinstate missing null check in SpellRay, fixes part of #519

Browse Source
This commit is contained in:
Electroblob77
2020-10-28 23:43:08 +00:00
parent d3df59df73
commit 315f2e4b02
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/spell/SpellRay.java
+3
View File
@@ -178,6 +178,8 @@ public abstract class SpellRay extends Spell {
Vec3d origin = new Vec3d(caster.posX, caster.posY + caster.getEyeHeight() - Y_OFFSET, caster.posZ); Vec3d origin = new Vec3d(caster.posX, caster.posY + caster.getEyeHeight() - Y_OFFSET, caster.posZ);
Vec3d targetPos = null; Vec3d targetPos = null;
if(target != null){
if(!ignoreLivingEntities || !EntityUtils.isLiving(target)){ if(!ignoreLivingEntities || !EntityUtils.isLiving(target)){
targetPos = new Vec3d(target.posX, target.posY + target.height / 2, target.posZ); targetPos = new Vec3d(target.posX, target.posY + target.height / 2, target.posZ);
@@ -194,6 +196,7 @@ public abstract class SpellRay extends Spell {
targetPos = new Vec3d(x + 0.5, y + 1, z + 0.5); targetPos = new Vec3d(x + 0.5, y + 1, z + 0.5);
} }
} }
}
if(targetPos == null) return false; // If there was nothing to aim at (e.g. snare when the target is in the air) if(targetPos == null) return false; // If there was nothing to aim at (e.g. snare when the target is in the air)