From d31f4b76a96a64451a0047418513476866c3ea99 Mon Sep 17 00:00:00 2001
From: sovdee <10354869+sovdeeth@users.noreply.github.com>
Date: Sat, 6 Dec 2025 17:59:57 -0800
Subject: [PATCH] Base default values for attributes from the entity's
 defaults, not the global ones.

---
 .../java/ch/njol/skript/expressions/ExprEntityAttribute.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java b/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java
index 6c672c59ed6..4d480bc2f9d 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprEntityAttribute.java
@@ -93,7 +93,9 @@ public void change(Event event, @Nullable Object[] delta, ChangeMode mode) {
 						instance.setBaseValue(0);
 						break;
 					case RESET:
-						instance.setBaseValue(instance.getDefaultValue());
+						AttributeInstance defaultValue = entity.getType().getDefaultAttributes().getAttribute(attribute);
+						if (defaultValue != null)
+							instance.setBaseValue(defaultValue.getBaseValue());
 						break;
 					case REMOVE:
 						instance.setBaseValue(instance.getBaseValue() - deltaValue);