rm: Not our issue, we won't "fix" that

NiFeather · Nov 22, 2024 · 3804a2c · 3804a2c
1 parent 6c1de5e
commit 3804a2c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/src/main/java/xyz/nifeather/morph/events/CommonEventProcessor.java b/src/main/java/xyz/nifeather/morph/events/CommonEventProcessor.java
@@ -413,7 +413,6 @@ public void onPlayerJoin(PlayerJoinEvent e)
             instance.removeModifier(AttributeModifyingAbility.modifierKey);
             instance.removeModifier(VanillaDisguiseProvider.healthModifierKeyLegacy);
             instance.removeModifier(VanillaDisguiseProvider.healthModifierKey);
-            instance.removeModifier(VanillaDisguiseProvider.healthModifierKeyVanilla);
         }
 
         this.addSchedule(() -> PlayerListHandler.instance().handle(player));

diff --git a/src/main/java/xyz/nifeather/morph/providers/disguise/VanillaDisguiseProvider.java b/src/main/java/xyz/nifeather/morph/providers/disguise/VanillaDisguiseProvider.java
@@ -274,8 +274,6 @@ private void tryAddModifier(DisguiseState state)
             {
                 var modifier = new AttributeModifier(healthModifierKey, diffFinal, AttributeModifier.Operation.ADD_NUMBER);
 
-                // In case some data sync plugins not processing correctly, also check for minecraft namespace.
-                playerAttribute.removeModifier(healthModifierKeyVanilla);
                 playerAttribute.removeModifier(healthModifierKey);
 
                 // Also handle legacy keys
@@ -299,9 +297,6 @@ private void tryAddModifier(DisguiseState state)
     @NotNull
     public static final NamespacedKey healthModifierKey = Objects.requireNonNull(NamespacedKey.fromString("feathermorph:fm_health_modifier"), "How?!");
 
-    @NotNull
-    public static final NamespacedKey healthModifierKeyVanilla = Objects.requireNonNull(NamespacedKey.fromString("minecraft:fm_health_modifier"), "How?!");
-
     private void resetPlayerDimensions(Player player)
     {
         var nmsPlayer = NmsRecord.ofPlayer(player);