remove death message in lobby (MULTIARENA only) and in game (#280)

andrei1058 · Feb 20, 2022 · 3b4a81d · 3b4a81d
1 parent 705edfd
commit 3b4a81d
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/listeners/DamageDeathMove.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/listeners/DamageDeathMove.java
@@ -323,10 +323,12 @@ public void onDamageByEntity(EntityDamageByEntityEvent e) {
 
     @EventHandler
     public void onDeath(PlayerDeathEvent e) {
-        e.setDeathMessage(null);
         Player victim = e.getEntity(), killer = e.getEntity().getKiller();
         ITeam killersTeam = null;
         IArena a = Arena.getArenaByPlayer(victim);
+        if ((BedWars.getServerType() == ServerType.MULTIARENA && BedWars.getLobbyWorld().equals(e.getEntity().getWorld().getName())) || a != null) {
+            e.setDeathMessage(null);
+        }
         if (a != null) {
             if (a.isSpectator(victim)) {
                 victim.spigot().respawn();