Skip to content

fix: evaluate friendly-fire bypass on the attacker #772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
darbyjack merged 1 commit into from
Jul 12, 2026
Merged

fix: evaluate friendly-fire bypass on the attacker #772

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/main/java/me/glaremasters/guilds/listeners/EntityListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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));
}
}
Expand Down Expand Up @@ -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));
}
}
Expand All @@ -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));
}
Expand Down
Loading