Skip to content

Commit b004315

Browse files
committed
the vanish-fake-join-leave messages now fall back to vanilla format, if applicable
1 parent e9237a0 commit b004315

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.bukkit.BanEntry;
3535
import org.bukkit.BanList;
3636
import org.bukkit.Bukkit;
37+
import org.bukkit.ChatColor;
3738
import org.bukkit.GameMode;
3839
import org.bukkit.Location;
3940
import org.bukkit.Material;
@@ -343,20 +344,21 @@ public void onVanishStatusChange(final VanishStatusChangeEvent event) {
343344
}
344345

345346
if (event.getValue()) {
346-
final String quitMessage = buildQuitMessage((User) event.getAffected());
347+
String quitMessage = buildQuitMessage((User) event.getAffected());
347348

348-
if (!quitMessage.isEmpty()) {
349-
Bukkit.broadcastMessage(quitMessage);
350-
}
349+
if (quitMessage.isEmpty())
350+
quitMessage = ChatColor.YELLOW + event.getAffected().getName() + " left the game";
351351

352+
Bukkit.broadcastMessage(quitMessage);
352353
return;
353354
}
354355

355-
final String joinMessage = buildJoinMessage((User) event.getAffected(), false, null);
356+
String joinMessage = buildJoinMessage((User) event.getAffected(), false, null);
356357

357-
if (!joinMessage.isEmpty()) {
358-
Bukkit.broadcastMessage(joinMessage);
359-
}
358+
if (joinMessage.isEmpty())
359+
joinMessage = ChatColor.YELLOW + event.getAffected().getName() + " joined the game";
360+
361+
Bukkit.broadcastMessage(joinMessage);
360362
}
361363

362364
private String buildJoinMessage(final User user, boolean newUsername, String lastAccountName) {

0 commit comments

Comments
 (0)