From 6189b7278a2c0336941ee99e4be334a4a4e21297 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 30 Oct 2020 22:04:04 +0100 Subject: [PATCH] Hotfix gm 31 in testarena & tablist Signed-off-by: Lixfel --- FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java | 2 +- .../src/de/steamwar/fightsystem/fight/FightTeam.java | 2 +- .../de/steamwar/fightsystem/listener/PlayerStateListener.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java b/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java index 4d944c1..595e107 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java @@ -130,7 +130,7 @@ public class Fight { } } - if(FightSystem.getEventLeiter() == player) + if(FightSystem.getEventLeiter() == player || Config.test()) return; Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> { diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java index 9114a71..cfaed39 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java @@ -183,7 +183,7 @@ public class FightTeam implements IFightTeam{ 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()); if(!Config.test()) - Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), prefix + player.getName()).send(player), 1); + Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), prefix + player.getName()).send(player), 5); TechHider.reloadChunks(player, chunksToReload); return fightPlayer; } diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java index a5b182d..d07ab37 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/PlayerStateListener.java @@ -64,7 +64,7 @@ public class PlayerStateListener extends BasicListener{ Fight.setPlayerGamemode(player, GameMode.SPECTATOR); player.teleport(Config.SpecSpawn); if(!Config.test()) - Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), "§7" + player.getName()).send(player), 1); + Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> new TablistNamePacket(SteamwarUser.get(player.getUniqueId()).getId(), "§7" + player.getName()).send(player), 5); } else { player.teleport(fightTeam.getSpawn()); if(FightSystem.getFightState().setup())