Properly delegate effect state

AlexProgrammerDE · Oct 26, 2024 · d06963f · d06963f
1 parent 799e555
commit d06963f
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/state/EntityEffectState.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/state/EntityEffectState.java
@@ -67,18 +67,8 @@ public Optional<EffectData> getEffect(Effect effect) {
         state.blend()));
   }
 
-  public boolean hasEffect(Effect effect) {
-    return effects.containsKey(effect);
-  }
-
   public int getEffectAmplifier(Effect effect) {
-    var state = effects.get(effect);
-
-    if (state == null) {
-      return 0;
-    }
-
-    return state.amplifier();
+    return getEffect(effect).map(EffectData::amplifier).orElse(0);
   }
 
   public void tick() {