From e7c4c998a0d887f65da40b6308df7e828f289618 Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Wed, 2 Apr 2025 08:58:42 +0200 Subject: [PATCH] Revert "Allow edit of Lobby" This reverts commit 1dcd2f102cef283a3c38d9d496becdfbca135d74. --- LobbySystem/src/de/steamwar/lobby/LobbySystem.java | 2 +- LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java | 2 +- LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java | 4 ++-- LobbySystem/src/de/steamwar/lobby/listener/PlayerSpawn.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LobbySystem/src/de/steamwar/lobby/LobbySystem.java b/LobbySystem/src/de/steamwar/lobby/LobbySystem.java index 7449b5bc..4d198d4b 100644 --- a/LobbySystem/src/de/steamwar/lobby/LobbySystem.java +++ b/LobbySystem/src/de/steamwar/lobby/LobbySystem.java @@ -70,7 +70,7 @@ public class LobbySystem extends JavaPlugin { new DoubleJumpListener(); new ParticleListener(); new InventoryInteraction(); - // new WorldInteraction(); + new WorldInteraction(); new PlayerSeatListener(); new MapsRotateListener(); new TeleporterListener(); diff --git a/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java b/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java index 78a9281e..d782112d 100644 --- a/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java +++ b/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java @@ -60,7 +60,7 @@ public class ModifyCommand extends SWCommand implements Listener { LobbySystem.getEntityServer(true).removePlayer(player); player.setGameMode(GameMode.ADVENTURE); player.setOp(false); - // PlayerSpawn.giveItems(player); + PlayerSpawn.giveItems(player); }else { modifying.add(player); LobbySystem.getEntityServer(true).addPlayer(player); diff --git a/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java b/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java index 15fcc500..f8ce3338 100644 --- a/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java +++ b/LobbySystem/src/de/steamwar/lobby/jumpandrun/JumpAndRun.java @@ -169,8 +169,8 @@ public class JumpAndRun extends BasicListener { } public static void reset(Player player) { - // PlayerSpawn.giveItems(player); - // player.setAllowFlight(true); + PlayerSpawn.giveItems(player); + player.setAllowFlight(true); CURRENT_POS.remove(player); START.remove(player); FAILS.remove(player); diff --git a/LobbySystem/src/de/steamwar/lobby/listener/PlayerSpawn.java b/LobbySystem/src/de/steamwar/lobby/listener/PlayerSpawn.java index 6ab111e8..dd7fcb8f 100644 --- a/LobbySystem/src/de/steamwar/lobby/listener/PlayerSpawn.java +++ b/LobbySystem/src/de/steamwar/lobby/listener/PlayerSpawn.java @@ -53,12 +53,12 @@ public class PlayerSpawn extends BasicListener { Player player = e.getPlayer(); e.setJoinMessage(null); - player.setGameMode(GameMode.SURVIVAL); + player.setGameMode(GameMode.ADVENTURE); player.setWalkSpeed(0.5f); player.teleport(Bukkit.getWorlds().get(0).getSpawnLocation().clone().add(0.5, 0, 0.5)); player.setHealth(20); player.setFoodLevel(20); - // giveItems(player); + giveItems(player); LobbySystem.getEntityServer(false).addPlayer(player); BoatRace.boatNpcServer.addPlayer(player);