From 1478841098f6394097b0b21fef04d8e7d5019289 Mon Sep 17 00:00:00 2001 From: luisc Date: Mon, 25 Oct 2021 00:58:03 -0500 Subject: [PATCH] Added hurt functions to ScriptLivingBase --- .../npcs/scripted/entity/ScriptLivingBase.java | 15 +++++++++++++++ .../npcs/scripted/wrapper/WrapperNpcAPI.java | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java index 9a1a23cb2..252b04ff3 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptLivingBase.java @@ -4,10 +4,13 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EntityDamageSource; import noppes.npcs.controllers.ScriptController; import noppes.npcs.scripted.ScriptItemStack; import noppes.npcs.scripted.constants.EntityType; import noppes.npcs.scripted.interfaces.IEntityLivingBase; +import noppes.npcs.scripted.wrapper.ScriptDamageSource; public class ScriptLivingBase extends ScriptEntity implements IEntityLivingBase { protected T entity; @@ -30,6 +33,18 @@ public class ScriptLivingBase extends ScriptEntity