Extract method

EternalCodeTeam · Oct 29, 2024 · b4d039b · Rollczi · Oct 29, 2024 · b4d039b
1 parent bf989cf
commit b4d039b
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/...mbat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightTagController.java b/...mbat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightTagController.java
@@ -55,13 +55,11 @@ void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
         UUID attackedUniqueId = attackedPlayerByPerson.getUniqueId();
         UUID attackerUniqueId = attacker.getUniqueId();
 
-        if (attacker.isOp() && this.config.settings.excludeOpFromCombat ||
-            attacker.getGameMode().equals(GameMode.CREATIVE) && this.config.settings.excludeCreativeFromCombat ) {
+        if (this.cannotBeTagged(attacker)) {
             return;
         }
 
-        if (attackedPlayerByPerson.isOp() && this.config.settings.excludeOpFromCombat ||
-            attackedPlayerByPerson.getGameMode().equals(GameMode.CREATIVE) && this.config.settings.excludeCreativeFromCombat) {
+        if (this.cannotBeTagged(attackedPlayerByPerson)) {
             return;
         }
 
@@ -95,6 +93,10 @@ void onEntityDamage(EntityDamageEvent event) {
             return;
         }
 
+        if (this.cannotBeTagged(player)) {
+            return;
+        }
+
         Duration combatTime = this.config.settings.combatDuration;
 
         UUID uuid = player.getUniqueId();
@@ -132,4 +134,9 @@ private boolean isPlayerInDisabledWorld(Player player) {
         return this.config.settings.worldsToIgnore.contains(worldName);
     }
 
+    private boolean cannotBeTagged(Player player) {
+        return (player.getGameMode().equals(GameMode.CREATIVE) && this.config.settings.excludeCreativeFromCombat) ||
+            (player.isOp() && this.config.settings.excludeOpFromCombat);
+    }
+
 }