Merge branch '1.21.1' into 1.21.3

NiFeather · Dec 2, 2024 · c77b876 · c77b876
2 parents 9183b87 + 2635cd8
commit c77b876
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...ther/morph/backends/server/renderer/network/datawatcher/watchers/types/EntityWatcher.java b/...ther/morph/backends/server/renderer/network/datawatcher/watchers/types/EntityWatcher.java
@@ -79,7 +79,7 @@ protected <X> void onEntryWrite(CustomEntry<X> entry, X oldVal, X newVal)
     {
         super.onEntryWrite(entry, oldVal, newVal);
 
-        if (entry.equals(CustomEntries.DISGUISE_NAME))
+        if (entry.equals(CustomEntries.DISGUISE_NAME) && this.getEntityType() != EntityType.PLAYER)
         {
             var str = newVal.toString();
             var component = str.isEmpty() ? null : Component.literal(str);