Fixed crash when Hanzo's arrows collide with non-living entities

2piradians · Sep 5, 2017 · 5644432 · 5644432
1 parent 9163945
commit 5644432
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'net.minecraftforge.gradle.forge'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "1.12.1-3.2.2"
+version = "1.12.1-3.2.4"
 group = "twopiradians.minewatch" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "Minewatch"
 

diff --git a/src/main/java/twopiradians/minewatch/common/Minewatch.java b/src/main/java/twopiradians/minewatch/common/Minewatch.java
@@ -21,7 +21,7 @@ public class Minewatch
 {
     public static final String MODNAME = "Minewatch";
     public static final String MODID = "minewatch";
-    public static final String VERSION = "3.2.2";
+    public static final String VERSION = "3.2.4";
     @Mod.Instance(MODID)
     public static Minewatch instance;
     public static MinewatchTab tab = new MinewatchTab("tabMinewatch");

diff --git a/src/main/java/twopiradians/minewatch/common/entity/EntityHanzoArrow.java b/src/main/java/twopiradians/minewatch/common/entity/EntityHanzoArrow.java
@@ -54,7 +54,7 @@ public void onUpdate() {
 
 	@Override
 	protected void onHit(RayTraceResult result) {
-		if (this.world.isRemote && result.entityHit != null && result.entityHit != this.shootingEntity && 
+		if (this.world.isRemote && result.entityHit instanceof EntityLivingBase && result.entityHit != this.shootingEntity && 
 				((EntityLivingBase)result.entityHit).getHealth() > 0 && this.shootingEntity != null)
 			this.shootingEntity.playSound(ModSoundEvents.hurt, 0.3f, result.entityHit.world.rand.nextFloat()/2+0.75f);
 

diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,7 +3,7 @@
   "modid": "minewatch",
   "name": "Minewatch",
   "description": "Overwatch characters in Minecraft.",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "mcversion": "1.12.2",
   "url": "https://github.com/2piradians/Minewatch",
   "updateUrl": "",

diff --git a/update.json b/update.json
@@ -1,7 +1,7 @@
 {
 	"homepage": "https://minecraft.curseforge.com/projects/minewatch/files",
 	"promos": {
-		"1.12.1-latest": "3.2.2",
-		"1.12.1-recommended": "3.2.2"
+		"1.12.1-latest": "3.2.4",
+		"1.12.1-recommended": "3.2.4"
 	}
 }