summaryrefslogtreewikicommitdiff
path: root/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
diff options
context:
space:
mode:
authorTyler Murphy <tylermurphy534@gmail.com>2022-05-04 09:28:38 -0400
committerTyler Murphy <tylermurphy534@gmail.com>2022-05-04 09:28:38 -0400
commit664c0d9ad5eaaefd9bc7e56ca732c58cb6030b72 (patch)
treed47e508ec58487b5fb000c1178c72575a778eb67 /src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
parentstart of 1.4.3 (diff)
downloadkenshinshideandseek-664c0d9ad5eaaefd9bc7e56ca732c58cb6030b72.tar.gz
kenshinshideandseek-664c0d9ad5eaaefd9bc7e56ca732c58cb6030b72.tar.bz2
kenshinshideandseek-664c0d9ad5eaaefd9bc7e56ca732c58cb6030b72.zip
1.4.3 beta 2 (bug fix issue requests)
Diffstat (limited to '')
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/game/Game.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
index eb467c4..72a530f 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
@@ -171,6 +171,7 @@ public class Game {
}
worldBorder.resetWorldborder("hideandseek_"+spawnWorld);
for(Player player : Board.getPlayers()) {
+ player.teleport(new Location(Bukkit.getWorld(lobbyWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ()));
Board.createLobbyBoard(player);
player.setGameMode(GameMode.ADVENTURE);
Board.addHider(player);
@@ -179,7 +180,6 @@ public class Game {
player.getInventory().setItem(lobbyItemStartPosition, lobbyStartItem);
if(lobbyLeaveItem != null)
player.getInventory().setItem(lobbyItemLeavePosition, lobbyLeaveItem);
- player.teleport(new Location(Bukkit.getWorld(lobbyWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ()));
for(PotionEffect effect : player.getActivePotionEffects()){
player.removePotionEffect(effect.getType());
}
@@ -259,6 +259,7 @@ public class Game {
public static void join(Player player){
if(Game.status == Status.STANDBY) {
+ player.teleport(new Location(Bukkit.getWorld(lobbyWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ()));
player.getInventory().clear();
if(lobbyStartItem != null && (!lobbyItemStartAdmin || player.hasPermission("hideandseek.start")))
player.getInventory().setItem(lobbyItemStartPosition, lobbyStartItem);
@@ -267,7 +268,6 @@ public class Game {
Board.addHider(player);
if(announceMessagesToNonPlayers) Bukkit.broadcastMessage(messagePrefix + message("GAME_JOIN").addPlayer(player));
else Game.broadcastMessage(messagePrefix + message("GAME_JOIN").addPlayer(player));
- player.teleport(new Location(Bukkit.getWorld(lobbyWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ()));
player.setGameMode(GameMode.ADVENTURE);
Board.createLobbyBoard(player);
Board.reloadLobbyBoards();