Merge remote-tracking branch 'origin/master'

AllayMC · Jun 29, 2024 · 3e8bf37 · 3e8bf37
2 parents cb5098f + fe1c6b1
commit 3e8bf37
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 26 deletions.
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/EffectInstance.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/EffectInstance.java
@@ -10,12 +10,25 @@
  */
 public interface EffectInstance {
 
+    static EffectInstance fromNBT(NbtMap nbt) {
+        var effectType = EffectRegistry.getRegistry().getByK1((int) nbt.getByte("Id"));
+        Preconditions.checkNotNull(effectType, "Effect type not found for id: " + nbt.getByte("Id") + "!");
+        int amplifier = nbt.getByte("Amplifier");
+        int duration = nbt.getInt("Duration");
+        boolean visible = nbt.getBoolean("ShowParticles");
+        return new SimpleEffectInstance(effectType, amplifier, duration, visible);
+    }
+
     EffectType getType();
 
     int getAmplifier();
 
     void setAmplifier(int amplifier);
 
+    default int getLevel() {
+        return getAmplifier() + 1;
+    }
+
     boolean isVisible();
 
     void setVisible(boolean visible);
@@ -25,13 +38,4 @@ public interface EffectInstance {
     void setDuration(int duration);
 
     NbtMap saveNBT();
-
-    static EffectInstance fromNBT(NbtMap nbt) {
-        var effectType = EffectRegistry.getRegistry().getByK1((int) nbt.getByte("Id"));
-        Preconditions.checkNotNull(effectType, "Effect type not found for id: " + nbt.getByte("Id") + "!");
-        int amplifier = nbt.getByte("Amplifier");
-        int duration = nbt.getInt("Duration");
-        boolean visible = nbt.getBoolean("ShowParticles");
-        return new SimpleEffectInstance(effectType, amplifier, duration, visible);
-    }
 }
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectAbsorptionType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectAbsorptionType.java
@@ -21,11 +21,7 @@ private EffectAbsorptionType() {
 
     @Override
     public void onAdd(Entity entity, EffectInstance effectInstance) {
-        var amplifier = effectInstance.getAmplifier() + 1;
-        var newValue = amplifier * 4;
-        if (newValue > entity.getAbsorption()) {
-            entity.setAbsorption(newValue);
-        }
+        entity.setAbsorption(effectInstance.getLevel() * 4);
     }
 
     @Override

diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectHealthBoostType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectHealthBoostType.java
@@ -22,16 +22,16 @@ private EffectHealthBoostType() {
 
     @Override
     public void onAdd(Entity entity, EffectInstance effectInstance) {
-        var amplifier = effectInstance.getAmplifier() + 1;
         if (!(entity instanceof EntityAttributeComponent attributeComponent)) return;
-        attributeComponent.setMaxHealth(attributeComponent.getMaxHealth() + (amplifier * 4));
+        var level = effectInstance.getLevel();
+        attributeComponent.setMaxHealth(attributeComponent.getMaxHealth() + (level * 4));
     }
 
     @Override
     public void onRemove(Entity entity, EffectInstance effectInstance) {
-        var amplifier = effectInstance.getAmplifier() + 1;
         if (!(entity instanceof EntityAttributeComponent attributeComponent)) return;
-        attributeComponent.setMaxHealth(attributeComponent.getMaxHealth() - (amplifier * 4));
+        var level = effectInstance.getLevel();
+        attributeComponent.setMaxHealth(attributeComponent.getMaxHealth() - (level * 4));
         if (attributeComponent.getHealth() > attributeComponent.getMaxHealth()) {
             attributeComponent.setHealth(attributeComponent.getMaxHealth());
         }

diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSlownessType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSlownessType.java
@@ -23,17 +23,17 @@ private EffectSlownessType() {
     @Override
     public void onAdd(Entity entity, EffectInstance effectInstance) {
         if (!(entity instanceof EntityPlayer player)) return;
-        var amplifier = effectInstance.getAmplifier() + 1;
-        var slowness = 1 - amplifier * 0.15f;
+        var level = effectInstance.getLevel();
+        var slowness = 1 - level * 0.15f;
         if (slowness <= 0) slowness = 0.00001f;
         player.setMovementSpeed(player.getMovementSpeed() * slowness);
     }
 
     @Override
     public void onRemove(Entity entity, EffectInstance effectInstance) {
         if (!(entity instanceof EntityPlayer player)) return;
-        var amplifier = effectInstance.getAmplifier() + 1;
-        var slowness = 1 - amplifier * 0.15f;
+        var level = effectInstance.getLevel();
+        var slowness = 1 - level * 0.15f;
         if (slowness <= 0) slowness = 0.00001f;
         player.setMovementSpeed(player.getMovementSpeed() / slowness);
     }

diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSpeedType.java b/Allay-API/src/main/java/org/allaymc/api/entity/effect/type/EffectSpeedType.java
@@ -23,16 +23,16 @@ private EffectSpeedType() {
     @Override
     public void onAdd(Entity entity, EffectInstance effectInstance) {
         if (!(entity instanceof EntityPlayer player)) return;
-        var amplifier = effectInstance.getAmplifier() + 1;
-        var speed = 1 + amplifier * 0.2f;
+        var level = effectInstance.getLevel();
+        var speed = 1 + level * 0.2f;
         player.setMovementSpeed(player.getMovementSpeed() * speed);
     }
 
     @Override
     public void onRemove(Entity entity, EffectInstance effectInstance) {
         if (!(entity instanceof EntityPlayer player)) return;
-        var amplifier = effectInstance.getAmplifier() + 1;
-        var speed = 1 + amplifier * 0.2f;
+        var level = effectInstance.getLevel();
+        var speed = 1 + level * 0.2f;
         player.setMovementSpeed(player.getMovementSpeed() / speed);
     }
 }
diff --git a/...c/main/java/org/allaymc/server/entity/component/player/EntityPlayerBaseComponentImpl.java b/...c/main/java/org/allaymc/server/entity/component/player/EntityPlayerBaseComponentImpl.java
@@ -755,6 +755,7 @@ protected void sendMobEffectPacket(MobEffectPacket packet) {
 
     @Override
     public void setAbsorption(float absorption) {
+        if (this.absorption == absorption) return;
         super.setAbsorption(absorption);
         attributeComponent.setAttribute(AttributeType.ABSORPTION, absorption);
     }