Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,18 @@
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.metadata.MetadataValue;
import org.bukkit.plugin.Plugin;
import org.bukkit.scoreboard.Team;

final class DeathMessageListener implements Listener {

/**
* Metadata key set by other plugins (e.g. MoreFlags) on players who must not receive the current death message.
* It is consumed (removed from every online player) at the end of each death event handled here.
*/
private static final String HIDE_METADATA_KEY = "no_see_death_message";

private final Plugin plugin;
private final PlayerData playerData;

Expand All @@ -31,20 +38,28 @@ final class DeathMessageListener implements Listener {
*/
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPlayerDeath(PlayerDeathEvent event) {
try {
filterDeathMessage(event);
} finally {
clearHideMetadata();
}
}

private void filterDeathMessage(PlayerDeathEvent event) {
Component deathMessage = event.deathMessage();
if (deathMessage == null || !event.getShowDeathMessages()) {
return;
}

var onlinePlayers = plugin.getServer().getOnlinePlayers();
if (onlinePlayers.stream().noneMatch(playerData::isHidingDeathMessage)) {
if (onlinePlayers.stream().noneMatch(this::isHiding)) {
return;
}

Player victim = event.getPlayer();
List<Player> recipients = new ArrayList<>(onlinePlayers.size());
for (Player player : onlinePlayers) {
if (!playerData.isHidingDeathMessage(player) && canSeeByTeamRule(victim, player)) {
if (!isHiding(player) && canSeeByTeamRule(victim, player)) {
recipients.add(player);
}
}
Expand All @@ -58,6 +73,19 @@ public void onPlayerDeath(PlayerDeathEvent event) {
recipients.forEach(player -> player.sendMessage(deathMessage));
}

private boolean isHiding(Player player) {
return playerData.isHidingDeathMessage(player) || player.hasMetadata(HIDE_METADATA_KEY);
}

@SuppressWarnings("deprecation") // The metadata API is deprecated, but it is the contract with MoreFlags.
private void clearHideMetadata() {
for (Player player : plugin.getServer().getOnlinePlayers()) {
for (MetadataValue value : player.getMetadata(HIDE_METADATA_KEY)) {
player.removeMetadata(HIDE_METADATA_KEY, value.getOwningPlugin());
}
}
}

/**
* Reproduces vanilla's handling of the {@code deathMessageVisibility} team option.
*/
Expand Down
Loading