From db912318defe012e9af41afad01a7d7f7602feb5 Mon Sep 17 00:00:00 2001 From: "Alex \"mcmonkey\" Goodwin" Date: Thu, 5 Jan 2023 10:59:48 -0800 Subject: [PATCH] hurt command: reset blockDamage too --- .../denizen/nms/v1_17/helpers/EntityHelperImpl.java | 1 + .../denizen/nms/v1_18/helpers/EntityHelperImpl.java | 1 + .../denizen/nms/v1_19/helpers/EntityHelperImpl.java | 1 + 3 files changed, 3 insertions(+) diff --git a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/EntityHelperImpl.java b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/EntityHelperImpl.java index 063ec64025..f6bab271b0 100644 --- a/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/EntityHelperImpl.java +++ b/v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/EntityHelperImpl.java @@ -615,6 +615,7 @@ public void damage(LivingEntity target, float amount, EntityTag source, Location } finally { CraftEventFactory.entityDamage = null; + CraftEventFactory.blockDamage = null; } } diff --git a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EntityHelperImpl.java b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EntityHelperImpl.java index 7d94f523b5..04953de9b7 100644 --- a/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EntityHelperImpl.java +++ b/v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/EntityHelperImpl.java @@ -692,6 +692,7 @@ public void damage(LivingEntity target, float amount, EntityTag source, Location } finally { CraftEventFactory.entityDamage = null; + CraftEventFactory.blockDamage = null; } } diff --git a/v1_19/src/main/java/com/denizenscript/denizen/nms/v1_19/helpers/EntityHelperImpl.java b/v1_19/src/main/java/com/denizenscript/denizen/nms/v1_19/helpers/EntityHelperImpl.java index af12f1c7d9..8dea5ab209 100644 --- a/v1_19/src/main/java/com/denizenscript/denizen/nms/v1_19/helpers/EntityHelperImpl.java +++ b/v1_19/src/main/java/com/denizenscript/denizen/nms/v1_19/helpers/EntityHelperImpl.java @@ -696,6 +696,7 @@ public void damage(LivingEntity target, float amount, EntityTag source, Location } finally { CraftEventFactory.entityDamage = null; + CraftEventFactory.blockDamage = null; } }