Skip to content
Open
Show file tree
Hide file tree
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 @@ -171,11 +171,15 @@ public void onPlayerDeathEvent(final PlayerDeathEvent event) {
user.setLastLocation();
user.sendTl("backAfterDeath");
}
if (!ess.getSettings().areDeathMessagesEnabled()) {
if (!ess.getSettings().areDeathMessagesEnabled() || isVanishHide(user)) {
event.setDeathMessage("");
}
}

private boolean isVanishHide(final User user) {
return ess.getSettings().isVanishHideMessages() && user.isHidden();
}

@EventHandler(priority = EventPriority.LOW)
public void onPlayerDeathExpEvent(final PlayerDeathEvent event) {
final User user = ess.getUser(event.getEntity());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ public void onPlayerQuit(final PlayerQuitEvent event) {
ess.getScheduler().cancelTask(pendingId);
}

if (hideJoinQuitMessages() || ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("essentials.silentquit")) {
if (hideJoinQuitMessages() || ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("essentials.silentquit") || isVanishHide(user)) {
event.setQuitMessage(null);
} else if (ess.getSettings().isCustomQuitMessage() && event.getQuitMessage() != null) {
final Player player = event.getPlayer();
Expand Down Expand Up @@ -341,6 +341,10 @@ public void onPlayerQuit(final PlayerQuitEvent event) {
user.dispose();
}

private boolean isVanishHide(final User user) {
return ess.getSettings().isVanishHideMessages() && (user.isHidden() || user.isLeavingHidden());
}

@SuppressWarnings("UnstableApiUsage")
private final class JoinListener1_21 implements Listener {
private final Map<UUID, String> newUserLocales = new ConcurrentHashMap<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,8 @@ public interface ISettings extends IConf {

boolean sleepIgnoresVanishedPlayers();

boolean isVanishHideMessages();

boolean isAfkListName();

String getAfkListName();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1350,6 +1350,11 @@ public boolean sleepIgnoresVanishedPlayers() {
return config.getBoolean("sleep-ignores-vanished-player", true);
}

@Override
public boolean isVanishHideMessages() {
return config.getBoolean("vanish-hide-messages", false);
}

public String _getAfkListName() {
return FormatUtil.replaceFormat(config.getString("afk-list-name", "none"));
}
Expand Down
3 changes: 3 additions & 0 deletions Essentials/src/main/resources/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,9 @@ sleep-ignores-afk-players: true
# Players with the permission 'essentials.sleepingignored' will always be ignored.
sleep-ignores-vanished-player: true

# Whether quit and death messages from vanished players should be hidden from ingame-chat.
vanish-hide-messages: false

# Change the player's /list name when they are AFK. This is none by default, which specifies that Essentials
# should not interfere with the AFK player's /list name.
# You may use color codes, {USERNAME} for the player's name, or {PLAYER} for the player's display name.
Expand Down