diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/Store.java | 7 | ||||
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/Store.java b/src/main/java/net/tylermurphy/hideAndSeek/Store.java index 9aa07e0..ec64323 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/Store.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/Store.java @@ -1,5 +1,6 @@ package net.tylermurphy.hideAndSeek; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -23,9 +24,9 @@ public class Store { playerLastLocationList = new HashMap<String,Location>(); public static List<String> - Hider, - Seeker, - Spectator; + Hider = new ArrayList<String>(), + Seeker = new ArrayList<String>(), + Spectator = new ArrayList<String>(); public static Scoreboard board; diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java index 5cf83a1..40167c4 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java @@ -58,14 +58,18 @@ public class EventListener implements Listener { } else if(status.equals("Setup") || status.equals("Standby")) { if (lobbyManualJoin) { if(event.getPlayer().getWorld().getName().equals("hideandseek_"+spawnWorld)){ - event.getPlayer().teleport(new Location(Bukkit.getWorld(spawnWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ())); + if(lobbyPosition.getBlockX() != 0 || lobbyPosition.getBlockY() != 0 || lobbyPosition.getBlockZ() != 0) { + event.getPlayer().teleport(new Location(Bukkit.getWorld(spawnWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ())); + } return; } } Hider.add(event.getPlayer().getName()); HiderTeam.addEntry(event.getPlayer().getName()); event.getPlayer().setGameMode(GameMode.ADVENTURE); - event.getPlayer().teleport(new Location(Bukkit.getWorld(spawnWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ())); + if(lobbyPosition.getBlockX() != 0 || lobbyPosition.getBlockY() != 0 || lobbyPosition.getBlockZ() != 0) { + event.getPlayer().teleport(new Location(Bukkit.getWorld(spawnWorld), lobbyPosition.getX(),lobbyPosition.getY(),lobbyPosition.getZ())); + } } playerList.put(event.getPlayer().getName(), event.getPlayer()); } |