Merge pull request #71 from TownyAdvanced/hotfix/attribute_flood

Fix knockback attributes not being removed.
TownyAdvanced · Jan 7, 2023 · 2eb08c0 · 2eb08c0
2 parents 3bd522f + 63be604
commit 2eb08c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.townyadvanced</groupId>
   <artifactId>TownyCombat</artifactId>
-  <version>0.3.1</version>
+  <version>0.3.2</version>
   <name>townycombat</name> <!-- Leave lower-cased -->
 
   <properties>

diff --git a/src/main/java/io/github/townyadvanced/townycombat/utils/TownyCombatMovementUtil.java b/src/main/java/io/github/townyadvanced/townycombat/utils/TownyCombatMovementUtil.java
@@ -165,7 +165,7 @@ public static void adjustPlayerKnockbackResistance(Player player) {
             return;
 
         //Remove old modifier
-        for(AttributeModifier attributeModifier: new ArrayList<>(player.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED).getModifiers())) {
+        for(AttributeModifier attributeModifier: new ArrayList<>(player.getAttribute(Attribute.GENERIC_KNOCKBACK_RESISTANCE).getModifiers())) {
             if(attributeModifier.getName().equals(ATTRIBUTE_MODIFIER_NAME)) {
                 player.getAttribute(Attribute.GENERIC_KNOCKBACK_RESISTANCE).removeModifier(attributeModifier);
             }
@@ -185,7 +185,7 @@ public static void adjustMountKnockbackResistance(Player player) {
             return;
 
         //Remove old modifier
-        for(AttributeModifier attributeModifier: new ArrayList<>(mount.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED).getModifiers())) {
+        for(AttributeModifier attributeModifier: new ArrayList<>(mount.getAttribute(Attribute.GENERIC_KNOCKBACK_RESISTANCE).getModifiers())) {
             if(attributeModifier.getName().equals(ATTRIBUTE_MODIFIER_NAME)) {
                 mount.getAttribute(Attribute.GENERIC_KNOCKBACK_RESISTANCE).removeModifier(attributeModifier);
             }