From 259ca31f2b5b4d8a54562f059186253b0830b958 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Thu, 29 Oct 2020 12:19:23 +0100 Subject: [PATCH 1/3] Tablist name impl. as comments. Signed-off-by: Lixfel --- .../src/de/steamwar/fightsystem/fight/FightTeam.java | 2 ++ .../de/steamwar/fightsystem/listener/PlayerStateListener.java | 1 + 2 files changed, 3 insertions(+) diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java index 2dc3fdd..df53eb7 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java @@ -178,6 +178,7 @@ public class FightTeam implements IFightTeam{ 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(7, new ItemBuilder(Material.BEACON).removeAllAttributs().setDisplayName("§eRespawn").build()); + //new TablistNamePacket(SteamwarUser.get(player).getId(), prefix + player.name()).send(player); TechHider.reloadChunks(player, chunksToReload); return fightPlayer; } @@ -195,6 +196,7 @@ public class FightTeam implements IFightTeam{ Fight.setPlayerGamemode(player, GameMode.SPECTATOR); player.teleport(Config.SpecSpawn); + //new TablistNamePacket(SteamwarUser.get(player).getId(), "§7§o" + player.name()).send(player); TechHider.reloadChunks(player, chunksToReload); } diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java index 8f179e6..e75d51c 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java @@ -61,6 +61,7 @@ public class PlayerStateListener extends BasicListener{ if (fightTeam == null) { Fight.setPlayerGamemode(player, GameMode.SPECTATOR); player.teleport(Config.SpecSpawn); + //new TablistNamePacket(SteamwarUser.get(player).getId(), "§7§o" + player.name()).send(player); } else { player.teleport(fightTeam.getSpawn()); if(FightSystem.getFightState().setup()) -- 2.39.2 From 886e624bacbf04de916991788b576961a1b7aeec Mon Sep 17 00:00:00 2001 From: Lixfel Date: Thu, 29 Oct 2020 20:51:45 +0100 Subject: [PATCH 2/3] Impl. tablist name capability Signed-off-by: Lixfel --- .../src/de/steamwar/fightsystem/fight/FightTeam.java | 10 +++++++--- .../fightsystem/listener/PlayerStateListener.java | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java index df53eb7..aa7e00b 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java @@ -20,6 +20,7 @@ package de.steamwar.fightsystem.fight; import com.sk89q.worldedit.EditSession; +import de.steamwar.comms.packets.TablistNamePacket; import de.steamwar.core.Core; import de.steamwar.fightsystem.Config; import de.steamwar.fightsystem.FightSystem; @@ -27,7 +28,10 @@ import de.steamwar.fightsystem.IFightSystem; import de.steamwar.fightsystem.kit.KitManager; import de.steamwar.fightsystem.listener.PersonalKitCreator; import de.steamwar.fightsystem.states.FightState; -import de.steamwar.fightsystem.utils.*; +import de.steamwar.fightsystem.utils.ColorConverter; +import de.steamwar.fightsystem.utils.FightScoreboard; +import de.steamwar.fightsystem.utils.ItemBuilder; +import de.steamwar.fightsystem.utils.TechHider; import de.steamwar.fightsystem.winconditions.RankedPlayerLeftWincondition; import de.steamwar.inventory.SWItem; import de.steamwar.sql.NoClipboardException; @@ -178,7 +182,7 @@ public class FightTeam implements IFightTeam{ 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(7, new ItemBuilder(Material.BEACON).removeAllAttributs().setDisplayName("§eRespawn").build()); - //new TablistNamePacket(SteamwarUser.get(player).getId(), prefix + player.name()).send(player); + new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), prefix + player.getName()).send(player); TechHider.reloadChunks(player, chunksToReload); return fightPlayer; } @@ -196,7 +200,7 @@ public class FightTeam implements IFightTeam{ Fight.setPlayerGamemode(player, GameMode.SPECTATOR); player.teleport(Config.SpecSpawn); - //new TablistNamePacket(SteamwarUser.get(player).getId(), "§7§o" + player.name()).send(player); + new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), "§7§o" + player.getName()).send(player); TechHider.reloadChunks(player, chunksToReload); } diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java index e75d51c..721f523 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java @@ -19,6 +19,7 @@ package de.steamwar.fightsystem.listener; +import de.steamwar.comms.packets.TablistNamePacket; import de.steamwar.fightsystem.Config; import de.steamwar.fightsystem.FightSystem; import de.steamwar.fightsystem.countdown.Countdown; @@ -27,6 +28,7 @@ import de.steamwar.fightsystem.fight.Fight; import de.steamwar.fightsystem.fight.FightPlayer; import de.steamwar.fightsystem.fight.FightTeam; import de.steamwar.fightsystem.states.FightState; +import de.steamwar.sql.SteamwarUser; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -61,7 +63,7 @@ public class PlayerStateListener extends BasicListener{ if (fightTeam == null) { Fight.setPlayerGamemode(player, GameMode.SPECTATOR); player.teleport(Config.SpecSpawn); - //new TablistNamePacket(SteamwarUser.get(player).getId(), "§7§o" + player.name()).send(player); + new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), "§7§o" + player.getName()).send(player); } else { player.teleport(fightTeam.getSpawn()); if(FightSystem.getFightState().setup()) -- 2.39.2 From 924ed3b30aabfb6ed836acd142383d9c4b20b466 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 30 Oct 2020 07:31:21 +0100 Subject: [PATCH 3/3] Disable TablistPacket on test arenas Signed-off-by: Lixfel --- .../src/de/steamwar/fightsystem/fight/FightTeam.java | 6 ++++-- .../steamwar/fightsystem/listener/PlayerStateListener.java | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java index aa7e00b..142568e 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java @@ -182,7 +182,8 @@ public class FightTeam implements IFightTeam{ 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(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); return fightPlayer; } @@ -200,7 +201,8 @@ public class FightTeam implements IFightTeam{ Fight.setPlayerGamemode(player, GameMode.SPECTATOR); 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); } diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java index 721f523..56d6c93 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java @@ -63,7 +63,8 @@ public class PlayerStateListener extends BasicListener{ if (fightTeam == null) { Fight.setPlayerGamemode(player, GameMode.SPECTATOR); 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 { player.teleport(fightTeam.getSpawn()); if(FightSystem.getFightState().setup()) -- 2.39.2