From 092b3ce0c12a60ff7cd819f97004fb12b6e73936 Mon Sep 17 00:00:00 2001
From: luisc <lc0508383@gmail.com>
Date: Sat, 22 Jan 2022 22:50:01 -0600
Subject: [PATCH] Fixed overloaded hurt(damage,entity) function not working
 when an entity is to be hurt by a player

---
 src/main/java/noppes/npcs/entity/EntityNPCInterface.java     | 4 ++--
 .../java/noppes/npcs/scripted/entity/ScriptLivingBase.java   | 5 ++++-
 .../java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java     | 5 ++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
index 4c7aed224..2d029b97c 100644
--- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
+++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java
@@ -472,10 +472,10 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti
 
 	@Override
 	public boolean attackEntityFrom(DamageSource damagesource, float i) {
-        if (this.worldObj.isRemote || CustomNpcs.FreezeNPCs || damagesource.damageType.equals("inWall")){
+        if (this.worldObj.isRemote || CustomNpcs.FreezeNPCs || (damagesource.damageType != null && damagesource.damageType.equals("inWall"))){
             return false;
         }
-        if(damagesource.damageType.equals("outOfWorld") && isKilled()){
+        if(damagesource.damageType != null && damagesource.damageType.equals("outOfWorld") && isKilled()){
         	reset();
         }
         i = stats.resistances.applyResistance(damagesource, i);
diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java
index 843a402fd..e6ef07d7d 100644
--- a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java
+++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java
@@ -41,7 +41,10 @@ public class ScriptLivingBase<T extends EntityLivingBase> extends ScriptEntity<T
 	}
 
 	public void hurt(float damage, ScriptEntity source) {
-		entity.attackEntityFrom(new EntityDamageSource(source.getTypeName(),source.getMCEntity()),damage);
+		if(source.getType() == 1)//if player
+			entity.attackEntityFrom(new EntityDamageSource("player",source.getMCEntity()),damage);
+		else
+			entity.attackEntityFrom(new EntityDamageSource(source.getTypeName(),source.getMCEntity()),damage);
 	}
 
 	public void hurt(float damage, ScriptDamageSource damageSource) {
diff --git a/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java b/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java
index df967b3d4..7788edac9 100644
--- a/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java
+++ b/src/main/java/noppes/npcs/scripted/wrapper/WrapperNpcAPI.java
@@ -233,7 +233,10 @@ public class WrapperNpcAPI extends NpcAPI {
     }
 
     public IDamageSource getIDamageSource(IEntity entity) {
-        return new ScriptDamageSource(new EntityDamageSource(entity.getTypeName(),entity.getMCEntity()));
+        if(entity.getType() == 1)//if player
+            return new ScriptDamageSource(new EntityDamageSource("player",entity.getMCEntity()));
+        else
+            return new ScriptDamageSource(new EntityDamageSource(entity.getTypeName(),entity.getMCEntity()));
     }
 
     public void executeCommand(IWorld world, String command) {