SteamWar/FightSystem
Archiviert
13
1

tablistName #197

Manuell gemergt
Lixfel hat 3 Commits von tablistName nach master 2020-10-30 07:31:38 +01:00 zusammengeführt
2 geänderte Dateien mit 6 neuen und 3 gelöschten Zeilen
Nur Änderungen aus Commit 924ed3b30a werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -182,7 +182,8 @@ public class FightTeam implements IFightTeam{
if(KitManager.getKits(false).size() > 1 || Config.PersonalKits) if(KitManager.getKits(false).size() > 1 || Config.PersonalKits)
player.getInventory().setItem(1, new ItemBuilder(Material.LEATHER_CHESTPLATE).removeAllAttributs().addEnchantment(Enchantment.DURABILITY, 1).setDisplayName("§eKit wählen").build()); player.getInventory().setItem(1, new ItemBuilder(Material.LEATHER_CHESTPLATE).removeAllAttributs().addEnchantment(Enchantment.DURABILITY, 1).setDisplayName("§eKit wählen").build());
player.getInventory().setItem(7, new ItemBuilder(Material.BEACON).removeAllAttributs().setDisplayName("§eRespawn").build()); player.getInventory().setItem(7, new ItemBuilder(Material.BEACON).removeAllAttributs().setDisplayName("§eRespawn").build());
new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), prefix + player.getName()).send(player); if(!Config.test())
new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), prefix + player.getName()).send(player);
TechHider.reloadChunks(player, chunksToReload); TechHider.reloadChunks(player, chunksToReload);
return fightPlayer; return fightPlayer;
} }
@ -200,7 +201,8 @@ public class FightTeam implements IFightTeam{
Fight.setPlayerGamemode(player, GameMode.SPECTATOR); Fight.setPlayerGamemode(player, GameMode.SPECTATOR);
player.teleport(Config.SpecSpawn); player.teleport(Config.SpecSpawn);
new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), "§7§o" + player.getName()).send(player); if(!Config.test())
new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), "§7§o" + player.getName()).send(player);
TechHider.reloadChunks(player, chunksToReload); TechHider.reloadChunks(player, chunksToReload);
} }

Datei anzeigen

@ -63,7 +63,8 @@ public class PlayerStateListener extends BasicListener{
if (fightTeam == null) { if (fightTeam == null) {
Fight.setPlayerGamemode(player, GameMode.SPECTATOR); Fight.setPlayerGamemode(player, GameMode.SPECTATOR);
player.teleport(Config.SpecSpawn); player.teleport(Config.SpecSpawn);
new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), "§7§o" + player.getName()).send(player); if(!Config.test())
new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), "§7§o" + player.getName()).send(player);
} else { } else {
player.teleport(fightTeam.getSpawn()); player.teleport(fightTeam.getSpawn());
if(FightSystem.getFightState().setup()) if(FightSystem.getFightState().setup())