From 92f5dfdab51f76829633f49b81b38bf36ebf640a Mon Sep 17 00:00:00 2001
From: Glare <admin@glaremasters.me>
Date: Sat, 11 Jul 2026 21:16:04 -0500
Subject: [PATCH] fix: check friendly-fire bypass on attacker

---
 .../guilds/listeners/EntityListener.java             | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/me/glaremasters/guilds/listeners/EntityListener.java b/src/main/java/me/glaremasters/guilds/listeners/EntityListener.java
index 3d248ea35..e771be17a 100644
--- a/src/main/java/me/glaremasters/guilds/listeners/EntityListener.java
+++ b/src/main/java/me/glaremasters/guilds/listeners/EntityListener.java
@@ -138,7 +138,7 @@ public void onEntityDamage(EntityDamageByEntityEvent event) {
         final Player damager = (Player) event.getDamager();
 
         // Check if they are in the same guild and have permission to damage their guild members
-        if (guildHandler.isSameGuild(player, damager) && !player.hasPermission("guilds.ffa.guild")) {
+        if (guildHandler.isSameGuild(player, damager) && !damager.hasPermission("guilds.ffa.guild")) {
             event.setCancelled(!settingsManager.getProperty(GuildSettings.GUILD_DAMAGE));
             return;
         }
@@ -153,7 +153,7 @@ public void onEntityDamage(EntityDamageByEntityEvent event) {
         }
 
         // Check if they are allies and have permission to damage allies
-        if (guildHandler.isAlly(player, damager) && !player.hasPermission("guilds.ffa.ally")) {
+        if (guildHandler.isAlly(player, damager) && !damager.hasPermission("guilds.ffa.ally")) {
             event.setCancelled(!settingsManager.getProperty(GuildSettings.ALLY_DAMAGE));
         }
     }
@@ -183,13 +183,13 @@ public void onDamage(EntityDamageByEntityEvent event) {
         final Player damager = (Player) projectile.getShooter();
 
         // Check if they are in the same guild
-        if (guildHandler.isSameGuild(damaged, damager) && damaged != damager && !damaged.hasPermission("guilds.ffa.guild")) {
+        if (guildHandler.isSameGuild(damaged, damager) && damaged != damager && !damager.hasPermission("guilds.ffa.guild")) {
             event.setCancelled(!settingsManager.getProperty(GuildSettings.GUILD_DAMAGE));
             return;
         }
 
         // Check if they are allies
-        if (guildHandler.isAlly(damaged, damager) && !damaged.hasPermission("guilds.ffa.ally")) {
+        if (guildHandler.isAlly(damaged, damager) && !damager.hasPermission("guilds.ffa.ally")) {
             event.setCancelled(!settingsManager.getProperty(GuildSettings.ALLY_DAMAGE));
         }
     }
@@ -214,14 +214,14 @@ public void onFlameArrow(EntityCombustByEntityEvent event) {
         final Player damager = (Player) arrow.getShooter();
 
         // Check if they are in the same guild
-        if (guildHandler.isSameGuild(damagee, damager) && !damagee.hasPermission("guilds.ffa.guild")) {
+        if (guildHandler.isSameGuild(damagee, damager) && !damager.hasPermission("guilds.ffa.guild")) {
             arrow.setFireTicks(0);
             event.setCancelled(!settingsManager.getProperty(GuildSettings.GUILD_DAMAGE));
             return;
         }
 
         // Check if they are allies
-        if (guildHandler.isAlly(damagee, damager) && !damagee.hasPermission("guilds.ffa.ally")) {
+        if (guildHandler.isAlly(damagee, damager) && !damager.hasPermission("guilds.ffa.ally")) {
             arrow.setFireTicks(0);
             event.setCancelled(!settingsManager.getProperty(GuildSettings.ALLY_DAMAGE));
         }