From 2e419986e272223ac0706d248146b0b90ea5b24a Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Sat, 1 May 2021 11:58:18 +0100
Subject: [PATCH] Added legacy modifiers

---
 .../talismans/talismans/AttackSpeedTalisman.java         | 9 +++++++++
 .../talismans/talismans/talismans/SpeedTalisman.java     | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/AttackSpeedTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/AttackSpeedTalisman.java
index c8b7b8b..7a346c8 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/AttackSpeedTalisman.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/AttackSpeedTalisman.java
@@ -15,9 +15,16 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 public class AttackSpeedTalisman extends Talisman {
     private Map<TalismanLevel, AttributeModifier> modifiers;
+    private final AttributeModifier legacyModifier = new AttributeModifier(
+            UUID.nameUUIDFromBytes(this.getKey().getKey().getBytes()),
+            this.getKey().getKey(),
+            0,
+            AttributeModifier.Operation.MULTIPLY_SCALAR_1
+    );
 
     public AttackSpeedTalisman() {
         super("attack_speed");
@@ -52,6 +59,8 @@ public class AttackSpeedTalisman extends Talisman {
 
         AttributeModifier modifier = modifiers.get(event.getTalisman());
 
+        movementSpeed.removeModifier(legacyModifier);
+
         if (event.getType() == EquipType.EQUIP) {
             if (this.getDisabledWorlds().contains(player.getWorld())) {
                 movementSpeed.removeModifier(modifier);
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SpeedTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SpeedTalisman.java
index 1d1bd39..16c561d 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SpeedTalisman.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/SpeedTalisman.java
@@ -14,9 +14,16 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 public class SpeedTalisman extends Talisman {
     private Map<TalismanLevel, AttributeModifier> modifiers;
+    private final AttributeModifier legacyModifier = new AttributeModifier(
+            UUID.nameUUIDFromBytes(this.getKey().getKey().getBytes()),
+            this.getKey().getKey(),
+            0,
+            AttributeModifier.Operation.MULTIPLY_SCALAR_1
+    );
 
     public SpeedTalisman() {
         super("speed");
@@ -51,6 +58,8 @@ public class SpeedTalisman extends Talisman {
 
         AttributeModifier modifier = modifiers.get(event.getTalisman());
 
+        movementSpeed.removeModifier(legacyModifier);
+
         if (event.getType() == EquipType.EQUIP) {
             if (this.getDisabledWorlds().contains(player.getWorld())) {
                 movementSpeed.removeModifier(modifier);