diff --git a/war/src/main/java/bukkit/tommytony/war/command/SetZoneLobbyCommand.java b/war/src/main/java/bukkit/tommytony/war/command/SetZoneLobbyCommand.java index 68f0c0e..dacebc2 100644 --- a/war/src/main/java/bukkit/tommytony/war/command/SetZoneLobbyCommand.java +++ b/war/src/main/java/bukkit/tommytony/war/command/SetZoneLobbyCommand.java @@ -51,8 +51,7 @@ public class SetZoneLobbyCommand extends AbstractZoneMakerCommand { // Move the warzone lobby ZoneLobby lobby = givenWarzone.getLobby(); if (lobby != null) { - // reset existing lobby - lobby.getVolume().resetBlocks(); + // reset existing lobby and save new volume at new location lobby.setLocation(player.getLocation()); lobby.initialize(); this.msg("Warzone lobby moved to your location."); diff --git a/war/src/main/java/com/tommytony/war/Warzone.java b/war/src/main/java/com/tommytony/war/Warzone.java index 1ebfbc6..44c1b35 100644 --- a/war/src/main/java/com/tommytony/war/Warzone.java +++ b/war/src/main/java/com/tommytony/war/Warzone.java @@ -262,7 +262,6 @@ public class Warzone { team.initializeTeamSpawn(); if (team.getTeamFlag() != null) { team.setTeamFlag(team.getTeamFlag()); - // team.resetSign(); } } diff --git a/war/src/main/java/com/tommytony/war/ZoneLobby.java b/war/src/main/java/com/tommytony/war/ZoneLobby.java index e318686..db8e7d1 100644 --- a/war/src/main/java/com/tommytony/war/ZoneLobby.java +++ b/war/src/main/java/com/tommytony/war/ZoneLobby.java @@ -6,6 +6,7 @@ import java.util.Map; import org.bukkit.Location; import org.bukkit.Material; +import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.entity.Player; @@ -119,7 +120,8 @@ public class ZoneLobby { * @param playerLocation */ public void setLocation(Location playerLocation) { - this.createVolumeOrReset(); + World lobbyWorld = playerLocation.getWorld(); + this.createVolumeOrReset(lobbyWorld); // Lobby orientation int yaw = 0; @@ -147,7 +149,7 @@ public class ZoneLobby { this.wall = opposite; // a player facing south places a lobby that looks just like a lobby stuck to the north wall this.calculateLobbyWidth(); - this.lobbyMiddleWallBlock = new BlockInfo(this.warzone.getWorld().getBlockAt(playerLocation.getBlockX(), playerLocation.getBlockY(), playerLocation.getBlockZ()).getFace(facing, 6)); + this.lobbyMiddleWallBlock = new BlockInfo(lobbyWorld.getBlockAt(playerLocation.getBlockX(), playerLocation.getBlockY(), playerLocation.getBlockZ()).getFace(facing, 6)); Block corner1 = null; Block corner2 = null; @@ -156,17 +158,17 @@ public class ZoneLobby { int z = this.lobbyMiddleWallBlock.getZ(); if (this.wall == BlockFace.NORTH) { - corner1 = this.warzone.getWorld().getBlockAt(x, y - 1, z + this.lobbyHalfSide); - corner2 = this.warzone.getWorld().getBlockAt(x - this.lobbyDepth, y + 1 + this.lobbyHeight, z - this.lobbyHalfSide); + corner1 = lobbyWorld.getBlockAt(x, y - 1, z + this.lobbyHalfSide); + corner2 = lobbyWorld.getBlockAt(x - this.lobbyDepth, y + 1 + this.lobbyHeight, z - this.lobbyHalfSide); } else if (this.wall == BlockFace.EAST) { - corner1 = this.warzone.getWorld().getBlockAt(x - this.lobbyHalfSide, y - 1, z); - corner2 = this.warzone.getWorld().getBlockAt(x + this.lobbyHalfSide, y + 1 + this.lobbyHeight, z - this.lobbyDepth); + corner1 = lobbyWorld.getBlockAt(x - this.lobbyHalfSide, y - 1, z); + corner2 = lobbyWorld.getBlockAt(x + this.lobbyHalfSide, y + 1 + this.lobbyHeight, z - this.lobbyDepth); } else if (this.wall == BlockFace.SOUTH) { - corner1 = this.warzone.getWorld().getBlockAt(x, y - 1, z - this.lobbyHalfSide); - corner2 = this.warzone.getWorld().getBlockAt(x + this.lobbyDepth, y + 1 + this.lobbyHeight, z + this.lobbyHalfSide); + corner1 = lobbyWorld.getBlockAt(x, y - 1, z - this.lobbyHalfSide); + corner2 = lobbyWorld.getBlockAt(x + this.lobbyDepth, y + 1 + this.lobbyHeight, z + this.lobbyHalfSide); } else if (this.wall == BlockFace.WEST) { - corner1 = this.warzone.getWorld().getBlockAt(x + this.lobbyHalfSide, y - 1, z); - corner2 = this.warzone.getWorld().getBlockAt(x - this.lobbyHalfSide, y + 1 + this.lobbyHeight, z + this.lobbyDepth); + corner1 = lobbyWorld.getBlockAt(x + this.lobbyHalfSide, y - 1, z); + corner2 = lobbyWorld.getBlockAt(x - this.lobbyHalfSide, y + 1 + this.lobbyHeight, z + this.lobbyDepth); } this.saveLobbyBlocks(corner1, corner2); @@ -178,7 +180,7 @@ public class ZoneLobby { * @param newWall */ public void setWall(BlockFace newWall) { - this.createVolumeOrReset(); + this.createVolumeOrReset(this.warzone.getWorld()); // when attached to the warzone, lobby is in same world this.wall = newWall; ZoneVolume zoneVolume = this.warzone.getVolume(); @@ -232,12 +234,13 @@ public class ZoneLobby { this.saveLobbyBlocks(corner1, corner2); } - private void createVolumeOrReset() { + private void createVolumeOrReset(World lobbyWorld) { if (this.volume == null) { // no previous wall - this.volume = new Volume("lobby", this.warzone.getWorld()); + this.volume = new Volume("lobby", lobbyWorld); } else if (this.volume.isSaved()) { this.volume.resetBlocks(); + this.volume.setWorld(lobbyWorld); // set world for the case where where are changing lobby location between worlds } } @@ -265,7 +268,7 @@ public class ZoneLobby { public void initialize() { // maybe the number of teams change, now reset the gate positions if (this.lobbyMiddleWallBlock != null && this.volume != null /* && volume.isSaved() */) { - this.setGatePositions(BlockInfo.getBlock(this.warzone.getWorld(), this.lobbyMiddleWallBlock)); + this.setGatePositions(BlockInfo.getBlock(this.volume.getWorld(), this.lobbyMiddleWallBlock)); // flatten the area (set all but floor to air, then replace any floor air blocks with glass) this.volume.clearBlocksThatDontFloat(); this.volume.setToMaterial(Material.AIR); @@ -273,7 +276,7 @@ public class ZoneLobby { // add war hub link gate if (War.war.getWarHub() != null) { - Block linkGateBlock = BlockInfo.getBlock(this.warzone.getWorld(), this.warHubLinkGate); + Block linkGateBlock = BlockInfo.getBlock(this.volume.getWorld(), this.warHubLinkGate); this.placeGate(linkGateBlock, Material.OBSIDIAN); // add warhub sign String[] lines = new String[4]; @@ -288,14 +291,14 @@ public class ZoneLobby { this.placeAutoAssignGate(); for (String teamName : this.teamGateBlocks.keySet()) { BlockInfo gateInfo = this.teamGateBlocks.get(teamName); - this.placeGate(BlockInfo.getBlock(this.warzone.getWorld(), gateInfo), TeamKind.teamKindFromString(teamName)); + this.placeGate(BlockInfo.getBlock(this.volume.getWorld(), gateInfo), TeamKind.teamKindFromString(teamName)); } for (Team t : this.warzone.getTeams()) { this.resetTeamGateSign(t); } // set zone tp - this.zoneTeleportBlock = new BlockInfo(BlockInfo.getBlock(this.warzone.getWorld(), this.lobbyMiddleWallBlock).getFace(this.wall, 6)); + this.zoneTeleportBlock = new BlockInfo(BlockInfo.getBlock(this.volume.getWorld(), this.lobbyMiddleWallBlock).getFace(this.wall, 6)); int yaw = 0; if (this.wall == BlockFace.WEST) { yaw = 180; @@ -306,10 +309,10 @@ public class ZoneLobby { } else if (this.wall == BlockFace.NORTH) { yaw = 270; } - this.warzone.setTeleport(new Location(this.warzone.getWorld(), this.zoneTeleportBlock.getX(), this.zoneTeleportBlock.getY(), this.zoneTeleportBlock.getZ(), yaw, 0)); + this.warzone.setTeleport(new Location(this.volume.getWorld(), this.zoneTeleportBlock.getX(), this.zoneTeleportBlock.getY(), this.zoneTeleportBlock.getZ(), yaw, 0)); // set zone sign - Block zoneSignBlock = BlockInfo.getBlock(this.warzone.getWorld(), this.lobbyMiddleWallBlock).getFace(this.wall, 4); + Block zoneSignBlock = BlockInfo.getBlock(this.volume.getWorld(), this.lobbyMiddleWallBlock).getFace(this.wall, 4); byte data = 0; if (this.wall == BlockFace.NORTH) { data = (byte) 4; @@ -334,11 +337,11 @@ public class ZoneLobby { // lets get some light in here if (this.wall == BlockFace.NORTH || this.wall == BlockFace.SOUTH) { - BlockInfo.getBlock(this.warzone.getWorld(), this.lobbyMiddleWallBlock).getFace(BlockFace.DOWN).getFace(BlockFace.WEST, this.lobbyHalfSide - 1).getFace(this.wall, 9).setType(Material.GLOWSTONE); - BlockInfo.getBlock(this.warzone.getWorld(), this.lobbyMiddleWallBlock).getFace(BlockFace.DOWN).getFace(BlockFace.EAST, this.lobbyHalfSide - 1).getFace(this.wall, 9).setType(Material.GLOWSTONE); + BlockInfo.getBlock(this.volume.getWorld(), this.lobbyMiddleWallBlock).getFace(BlockFace.DOWN).getFace(BlockFace.WEST, this.lobbyHalfSide - 1).getFace(this.wall, 9).setType(Material.GLOWSTONE); + BlockInfo.getBlock(this.volume.getWorld(), this.lobbyMiddleWallBlock).getFace(BlockFace.DOWN).getFace(BlockFace.EAST, this.lobbyHalfSide - 1).getFace(this.wall, 9).setType(Material.GLOWSTONE); } else { - BlockInfo.getBlock(this.warzone.getWorld(), this.lobbyMiddleWallBlock).getFace(BlockFace.DOWN).getFace(BlockFace.NORTH, this.lobbyHalfSide - 1).getFace(this.wall, 9).setType(Material.GLOWSTONE); - BlockInfo.getBlock(this.warzone.getWorld(), this.lobbyMiddleWallBlock).getFace(BlockFace.DOWN).getFace(BlockFace.SOUTH, this.lobbyHalfSide - 1).getFace(this.wall, 9).setType(Material.GLOWSTONE); + BlockInfo.getBlock(this.volume.getWorld(), this.lobbyMiddleWallBlock).getFace(BlockFace.DOWN).getFace(BlockFace.NORTH, this.lobbyHalfSide - 1).getFace(this.wall, 9).setType(Material.GLOWSTONE); + BlockInfo.getBlock(this.volume.getWorld(), this.lobbyMiddleWallBlock).getFace(BlockFace.DOWN).getFace(BlockFace.SOUTH, this.lobbyHalfSide - 1).getFace(this.wall, 9).setType(Material.GLOWSTONE); } } else { War.war.log("Failed to initalize zone lobby for zone " + this.warzone.getName(), java.util.logging.Level.WARNING); @@ -474,7 +477,7 @@ public class ZoneLobby { rightSide = BlockFace.SOUTH; } List teams = this.warzone.getTeams(); - Block autoAssignGateBlock = BlockInfo.getBlock(this.warzone.getWorld(), this.autoAssignGate); + Block autoAssignGateBlock = BlockInfo.getBlock(this.volume.getWorld(), this.autoAssignGate); this.setBlock(autoAssignGateBlock.getFace(BlockFace.DOWN), (Material.GLOWSTONE)); int size = teams.size(); if (size > 0) { @@ -533,11 +536,11 @@ public class ZoneLobby { if (blockWall == this.wall) { for (String teamName : this.teamGateBlocks.keySet()) { BlockInfo gateInfo = this.teamGateBlocks.get(teamName); - if (this.isPartOfGate(BlockInfo.getBlock(this.warzone.getWorld(), gateInfo), block)) { + if (this.isPartOfGate(BlockInfo.getBlock(this.volume.getWorld(), gateInfo), block)) { return true; } } - if (this.autoAssignGate != null && this.isPartOfGate(BlockInfo.getBlock(this.warzone.getWorld(), this.autoAssignGate), block)) { + if (this.autoAssignGate != null && this.isPartOfGate(BlockInfo.getBlock(this.volume.getWorld(), this.autoAssignGate), block)) { // auto assign return true; } @@ -574,7 +577,7 @@ public class ZoneLobby { public void resetTeamGateSign(Team team) { BlockInfo info = this.teamGateBlocks.get(team.getName()); if (info != null) { - this.resetTeamGateSign(team, BlockInfo.getBlock(this.warzone.getWorld(), info)); + this.resetTeamGateSign(team, BlockInfo.getBlock(this.volume.getWorld(), info)); } } @@ -663,14 +666,14 @@ public class ZoneLobby { right = BlockFace.NORTH; } if (this.autoAssignGate != null) { - if (this.leaving(location, BlockInfo.getBlock(this.warzone.getWorld(), this.autoAssignGate), inside, left, right)) { + if (this.leaving(location, BlockInfo.getBlock(this.volume.getWorld(), this.autoAssignGate), inside, left, right)) { return true; } } for (String teamName : this.teamGateBlocks.keySet()) { BlockInfo info = this.teamGateBlocks.get(teamName); - if (this.leaving(location, BlockInfo.getBlock(this.warzone.getWorld(), info), inside, left, right)) { + if (this.leaving(location, BlockInfo.getBlock(this.volume.getWorld(), info), inside, left, right)) { return true; } } diff --git a/war/src/main/java/com/tommytony/war/mappers/WarzoneMapper.java b/war/src/main/java/com/tommytony/war/mappers/WarzoneMapper.java index 0224702..1d37849 100644 --- a/war/src/main/java/com/tommytony/war/mappers/WarzoneMapper.java +++ b/war/src/main/java/com/tommytony/war/mappers/WarzoneMapper.java @@ -362,18 +362,33 @@ public class WarzoneMapper { // lobby BlockFace lobbyFace = null; if (lobbyStr != null && !lobbyStr.equals("")) { - if (lobbyStr.equals("south")) { - lobbyFace = BlockFace.SOUTH; - } else if (lobbyStr.equals("east")) { - lobbyFace = BlockFace.EAST; - } else if (lobbyStr.equals("north")) { - lobbyFace = BlockFace.NORTH; - } else if (lobbyStr.equals("west")) { - lobbyFace = BlockFace.WEST; + String[] lobbyStrSplit = lobbyStr.split(","); + if (lobbyStrSplit.length > 0) { + // lobby orientation + if (lobbyStrSplit[0].equals("south")) { + lobbyFace = BlockFace.SOUTH; + } else if (lobbyStrSplit[0].equals("east")) { + lobbyFace = BlockFace.EAST; + } else if (lobbyStrSplit[0].equals("north")) { + lobbyFace = BlockFace.NORTH; + } else if (lobbyStrSplit[0].equals("west")) { + lobbyFace = BlockFace.WEST; + } + + // lobby world + World lobbyWorld = world; // by default, warzone world + if (lobbyStrSplit.length > 1) { + World strWorld = War.war.getServer().getWorld(lobbyStrSplit[1]); + if (strWorld != null) { + lobbyWorld = strWorld; + } + } + + // create the lobby + Volume lobbyVolume = VolumeMapper.loadVolume("lobby", warzone.getName(), lobbyWorld); + ZoneLobby lobby = new ZoneLobby(warzone, lobbyFace, lobbyVolume); + warzone.setLobby(lobby); } - Volume lobbyVolume = VolumeMapper.loadVolume("lobby", warzone.getName(), world); - ZoneLobby lobby = new ZoneLobby(warzone, lobbyFace, lobbyVolume); - warzone.setLobby(lobby); } return warzone; @@ -584,7 +599,7 @@ public class WarzoneMapper { lobbyStr = "west"; } } - warzoneConfig.setString("lobby", lobbyStr); + warzoneConfig.setString("lobby", lobbyStr + "," + warzone.getLobby().getVolume().getWorld().getName()); warzoneConfig.save(); warzoneConfig.close();