From f7276003d4e66841fed138d355816951a4b341cd Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Thu, 1 Apr 2021 14:18:02 +0100
Subject: [PATCH] Changed movement speed to multiplier

---
 .../src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java  | 6 +++---
 .../java/com/willfp/ecobosses/bosses/LivingEcoBoss.java     | 3 ++-
 .../core-plugin/src/main/resources/bosses/alpha_wolf.yml    | 2 +-
 .../core-plugin/src/main/resources/bosses/illusioner.yml    | 2 +-
 .../core-plugin/src/main/resources/bosses/steel_golem.yml   | 2 +-
 .../core-plugin/src/main/resources/bosses/tarantula.yml     | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java
index dcf2224..cd184b4 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/EcoBoss.java
@@ -98,10 +98,10 @@ public class EcoBoss extends PluginDependent {
     private final int attackDamage;
 
     /**
-     * The movement speed.
+     * The movement speed multiplier.
      */
     @Getter
-    private final int movementSpeed;
+    private final double movementSpeedMultiplier;
 
     /**
      * The immunity options.
@@ -257,7 +257,7 @@ public class EcoBoss extends PluginDependent {
         // Attributes
         this.attackDamage = this.getConfig().getInt("attack-damage");
         this.maxHealth = this.getConfig().getInt("max-health");
-        this.movementSpeed = this.getConfig().getInt("movement-speed");
+        this.movementSpeedMultiplier = this.getConfig().getInt("movement-speed");
 
         // Spawn Totem
         this.spawnTotemEnabled = this.getConfig().getBool("spawn-totem.enabled");
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
index 1abc5a1..8da6a0e 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecobosses/bosses/LivingEcoBoss.java
@@ -18,6 +18,7 @@ import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.attribute.AttributeInstance;
+import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.boss.BarFlag;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
@@ -102,7 +103,7 @@ public class LivingEcoBoss extends PluginDependent {
 
         AttributeInstance movementSpeed = entity.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED);
         assert movementSpeed != null;
-        movementSpeed.setBaseValue(boss.getMovementSpeed());
+        movementSpeed.addModifier(new AttributeModifier(entity.getUniqueId(), "ecobosses-movement-multiplier", boss.getMovementSpeedMultiplier() - 1, AttributeModifier.Operation.MULTIPLY_SCALAR_1));
 
         AttributeInstance maxHealth = entity.getAttribute(Attribute.GENERIC_MAX_HEALTH);
         assert maxHealth != null;
diff --git a/eco-core/core-plugin/src/main/resources/bosses/alpha_wolf.yml b/eco-core/core-plugin/src/main/resources/bosses/alpha_wolf.yml
index 8375743..6cdd7ff 100644
--- a/eco-core/core-plugin/src/main/resources/bosses/alpha_wolf.yml
+++ b/eco-core/core-plugin/src/main/resources/bosses/alpha_wolf.yml
@@ -10,7 +10,7 @@ bossbar:
 
 max-health: 900
 attack-damage: 60
-movement-speed: 1.1
+movement-speed: 2
 
 spawn-totem:
   enabled: true
diff --git a/eco-core/core-plugin/src/main/resources/bosses/illusioner.yml b/eco-core/core-plugin/src/main/resources/bosses/illusioner.yml
index 927eccf..f316341 100644
--- a/eco-core/core-plugin/src/main/resources/bosses/illusioner.yml
+++ b/eco-core/core-plugin/src/main/resources/bosses/illusioner.yml
@@ -10,7 +10,7 @@ bossbar:
 
 max-health: 600
 attack-damage: 50
-movement-speed: 0.6
+movement-speed: 1.2
 
 spawn-totem:
   enabled: true
diff --git a/eco-core/core-plugin/src/main/resources/bosses/steel_golem.yml b/eco-core/core-plugin/src/main/resources/bosses/steel_golem.yml
index 5d70c53..8f44353 100644
--- a/eco-core/core-plugin/src/main/resources/bosses/steel_golem.yml
+++ b/eco-core/core-plugin/src/main/resources/bosses/steel_golem.yml
@@ -10,7 +10,7 @@ bossbar:
 
 max-health: 2400
 attack-damage: 120
-movement-speed: 0.2
+movement-speed: 1.5
 
 spawn-totem:
   enabled: true
diff --git a/eco-core/core-plugin/src/main/resources/bosses/tarantula.yml b/eco-core/core-plugin/src/main/resources/bosses/tarantula.yml
index 2649aa8..26af663 100644
--- a/eco-core/core-plugin/src/main/resources/bosses/tarantula.yml
+++ b/eco-core/core-plugin/src/main/resources/bosses/tarantula.yml
@@ -10,7 +10,7 @@ bossbar:
 
 max-health: 1200
 attack-damage: 80
-movement-speed: 0.9
+movement-speed: 1.3
 
 spawn-totem:
   enabled: true