From b4d039b5366b846dc625a49e65bdb1c663fde9ee Mon Sep 17 00:00:00 2001 From: CitralFlo Date: Tue, 29 Oct 2024 20:22:23 +0100 Subject: [PATCH] Extract method --- .../fight/controller/FightTagController.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightTagController.java b/eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightTagController.java index a0dde19a..8db3768b 100644 --- a/eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/controller/FightTagController.java +++ b/eternalcombat-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); + } + }