fix: Entity shouldn't implement EntityAttributeComponent

AllayMC · Jun 28, 2024 · af00123 · af00123
1 parent 49dc567
commit af00123
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Allay-API/src/main/java/org/allaymc/api/entity/Entity.java b/Allay-API/src/main/java/org/allaymc/api/entity/Entity.java
@@ -12,7 +12,7 @@
  * @author daoge_cmd
  */
 public interface Entity extends
-        EntityBaseComponent, EntityAttributeComponent,
+        EntityBaseComponent,
         HasAABB, HasLongId {
 
     @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
@@ -1,6 +1,7 @@
 package org.allaymc.api.entity.effect.type;
 
 import org.allaymc.api.entity.Entity;
+import org.allaymc.api.entity.component.common.EntityAttributeComponent;
 import org.allaymc.api.entity.effect.AbstractEffectType;
 import org.allaymc.api.entity.effect.EffectInstance;
 import org.allaymc.api.utils.Identifier;
@@ -22,15 +23,17 @@ private EffectHealthBoostType() {
     @Override
     public void onAdd(Entity entity, EffectInstance effectInstance) {
         var amplifier = effectInstance.getAmplifier() + 1;
-        entity.setMaxHealth(entity.getMaxHealth() + (amplifier * 4));
+        if (!(entity instanceof EntityAttributeComponent attributeComponent)) return;
+        attributeComponent.setMaxHealth(attributeComponent.getMaxHealth() + (amplifier * 4));
     }
 
     @Override
     public void onRemove(Entity entity, EffectInstance effectInstance) {
         var amplifier = effectInstance.getAmplifier() + 1;
-        entity.setMaxHealth(entity.getMaxHealth() - (amplifier * 4));
-        if (entity.getHealth() > entity.getMaxHealth()) {
-            entity.setHealth(entity.getMaxHealth());
+        if (!(entity instanceof EntityAttributeComponent attributeComponent)) return;
+        attributeComponent.setMaxHealth(attributeComponent.getMaxHealth() - (amplifier * 4));
+        if (attributeComponent.getHealth() > attributeComponent.getMaxHealth()) {
+            attributeComponent.setHealth(attributeComponent.getMaxHealth());
         }
     }
 }