+ Added a after game warp to prevent spamming of signs. Fixes #21.
This commit is contained in:
		@@ -31,6 +31,7 @@ public class Arena implements ConfigurationSerializable {
 | 
			
		||||
	public LocationSerializable lobbyWarp;
 | 
			
		||||
	public LocationSerializable hidersWarp;
 | 
			
		||||
	public LocationSerializable seekersWarp;
 | 
			
		||||
	public LocationSerializable spawnWarp;
 | 
			
		||||
	public List<String> seekersWinCommands;
 | 
			
		||||
	public List<String> hidersWinCommands;
 | 
			
		||||
	public List<String> allowedCommands;
 | 
			
		||||
@@ -50,11 +51,12 @@ public class Arena implements ConfigurationSerializable {
 | 
			
		||||
			int waitingTimeSeeker, int gameTime, int timeUntilHidersSword,
 | 
			
		||||
			ArrayList<ItemStack> disguiseBlocks,
 | 
			
		||||
			LocationSerializable lobbyWarp, LocationSerializable hidersWarp,
 | 
			
		||||
			LocationSerializable seekersWarp, List<String> seekersWinCommands,
 | 
			
		||||
			List<String> hidersWinCommands, List<String> allowedCommands,
 | 
			
		||||
			int seekersTokenWin, int hidersTokenWin, int killTokens,
 | 
			
		||||
			List<Player> playersInArena, ArenaState gameState, int timer,
 | 
			
		||||
			List<Player> seekers, Scoreboard scoreboard) {
 | 
			
		||||
			LocationSerializable seekersWarp, LocationSerializable spawnWarp,
 | 
			
		||||
			List<String> seekersWinCommands, List<String> hidersWinCommands,
 | 
			
		||||
			List<String> allowedCommands, int seekersTokenWin,
 | 
			
		||||
			int hidersTokenWin, int killTokens, List<Player> playersInArena,
 | 
			
		||||
			ArenaState gameState, int timer, List<Player> seekers,
 | 
			
		||||
			Scoreboard scoreboard) {
 | 
			
		||||
		this.arenaName = arenaName;
 | 
			
		||||
		this.pos1 = pos1;
 | 
			
		||||
		this.pos2 = pos2;
 | 
			
		||||
@@ -69,6 +71,7 @@ public class Arena implements ConfigurationSerializable {
 | 
			
		||||
		this.lobbyWarp = lobbyWarp;
 | 
			
		||||
		this.hidersWarp = hidersWarp;
 | 
			
		||||
		this.seekersWarp = seekersWarp;
 | 
			
		||||
		this.spawnWarp = spawnWarp;
 | 
			
		||||
		this.seekersWinCommands = seekersWinCommands;
 | 
			
		||||
		this.hidersWinCommands = hidersWinCommands;
 | 
			
		||||
		this.allowedCommands = allowedCommands;
 | 
			
		||||
@@ -117,6 +120,7 @@ public class Arena implements ConfigurationSerializable {
 | 
			
		||||
		map.put("lobbyWarp", lobbyWarp);
 | 
			
		||||
		map.put("hidersWarp", hidersWarp);
 | 
			
		||||
		map.put("seekersWarp", seekersWarp);
 | 
			
		||||
		map.put("spawnWarp", spawnWarp);
 | 
			
		||||
		map.put("seekersWinCommands", seekersWinCommands);
 | 
			
		||||
		map.put("hidersWinCommands", hidersWinCommands);
 | 
			
		||||
		map.put("allowedCommands", allowedCommands);
 | 
			
		||||
@@ -145,6 +149,7 @@ public class Arena implements ConfigurationSerializable {
 | 
			
		||||
				(LocationSerializable) M.g(map, "lobbyWarp", loc),
 | 
			
		||||
				(LocationSerializable) M.g(map, "hidersWarp", loc),
 | 
			
		||||
				(LocationSerializable) M.g(map, "seekersWarp", loc),
 | 
			
		||||
				(LocationSerializable) M.g(map, "spawnWarp", loc),
 | 
			
		||||
				(ArrayList<String>) M.g(map, "seekersWinCommands",
 | 
			
		||||
						new ArrayList<String>()), (ArrayList<String>) M.g(map,
 | 
			
		||||
						"hidersWinCommands", new ArrayList<String>()),
 | 
			
		||||
 
 | 
			
		||||
@@ -96,10 +96,12 @@ public class ArenaHandler {
 | 
			
		||||
								Bukkit.getWorld(player.getWorld().getName()
 | 
			
		||||
										.toString()), 0, 0, 0, 0, 0);
 | 
			
		||||
						if (arena.lobbyWarp != null && arena.hidersWarp != null
 | 
			
		||||
								&& arena.seekersWarp != null) {
 | 
			
		||||
								&& arena.seekersWarp != null
 | 
			
		||||
								&& arena.spawnWarp != null) {
 | 
			
		||||
							if (!arena.lobbyWarp.equals(zero)
 | 
			
		||||
									&& !arena.hidersWarp.equals(zero)
 | 
			
		||||
									&& !arena.seekersWarp.equals(zero)) {
 | 
			
		||||
									&& !arena.seekersWarp.equals(zero)
 | 
			
		||||
									&& !arena.spawnWarp.equals(zero)) {
 | 
			
		||||
								if (arena.gameState == ArenaState.WAITING
 | 
			
		||||
										|| arena.gameState == ArenaState.STARTING) {
 | 
			
		||||
									if (arena.playersInArena.size() >= arena.maxPlayers) {
 | 
			
		||||
@@ -349,7 +351,7 @@ public class ArenaHandler {
 | 
			
		||||
			player.setHealth(pad.pHealth);
 | 
			
		||||
			player.setFoodLevel(pad.pFood);
 | 
			
		||||
			player.addPotionEffects(pad.pPotionEffects);
 | 
			
		||||
			player.teleport(pad.pLocation);
 | 
			
		||||
			player.teleport(arena.spawnWarp);
 | 
			
		||||
			player.setGameMode(pad.pGameMode);
 | 
			
		||||
			player.setAllowFlight(pad.pFlying);
 | 
			
		||||
			if (player.getAllowFlight()) {
 | 
			
		||||
 
 | 
			
		||||
@@ -210,7 +210,7 @@ public class BlockHunt extends JavaPlugin implements Listener {
 | 
			
		||||
				"sw", Permissions.setwarp, ConfigC.help_setwarp,
 | 
			
		||||
				(Boolean) W.config.get(ConfigC.commandEnabled_setwarp),
 | 
			
		||||
				BlockHuntCMD, new CMDsetwarp(),
 | 
			
		||||
				"/BlockHunt <setwarp|sw> <lobby|hiders|seekers> <arenaname>");
 | 
			
		||||
				"/BlockHunt <setwarp|sw> <lobby|hiders|seekers|spawn> <arenaname>");
 | 
			
		||||
		CMDremove = new CommandM("BlockHunt REMOVE", "BlockHunt", "remove",
 | 
			
		||||
				"delete", Permissions.remove, ConfigC.help_remove,
 | 
			
		||||
				(Boolean) W.config.get(ConfigC.commandEnabled_remove),
 | 
			
		||||
 
 | 
			
		||||
@@ -31,7 +31,7 @@ public class CMDcreate extends DefaultCMD {
 | 
			
		||||
						Arena arena = new Arena(args[1], W.pos1.get(player),
 | 
			
		||||
								W.pos2.get(player), 12, 3, 1, 50, 20, 300, 30,
 | 
			
		||||
								new ArrayList<ItemStack>(), null, null, null,
 | 
			
		||||
								new ArrayList<String>(),
 | 
			
		||||
								null, new ArrayList<String>(),
 | 
			
		||||
								new ArrayList<String>(),
 | 
			
		||||
								new ArrayList<String>(), 10, 50, 8,
 | 
			
		||||
								new ArrayList<Player>(), ArenaState.WAITING, 0,
 | 
			
		||||
 
 | 
			
		||||
@@ -51,6 +51,12 @@ public class CMDsetwarp extends DefaultCMD {
 | 
			
		||||
						MessageM.sendFMessage(player,
 | 
			
		||||
								ConfigC.normal_setwarpWarpSet, "warp-"
 | 
			
		||||
										+ warpname);
 | 
			
		||||
					} else if (warpname.equalsIgnoreCase("spawn")) {
 | 
			
		||||
						arena.spawnWarp = loc;
 | 
			
		||||
						save(arena);
 | 
			
		||||
						MessageM.sendFMessage(player,
 | 
			
		||||
								ConfigC.normal_setwarpWarpSet, "warp-"
 | 
			
		||||
										+ warpname);
 | 
			
		||||
					} else {
 | 
			
		||||
						MessageM.sendFMessage(player,
 | 
			
		||||
								ConfigC.error_setwarpWarpNotFound, "warp-"
 | 
			
		||||
 
 | 
			
		||||
@@ -8,7 +8,6 @@ import org.bukkit.inventory.ItemStack;
 | 
			
		||||
import org.bukkit.potion.PotionEffect;
 | 
			
		||||
 | 
			
		||||
public class PlayerArenaData {
 | 
			
		||||
	public Location pLocation;
 | 
			
		||||
	public GameMode pGameMode;
 | 
			
		||||
	public ItemStack[] pInventory;
 | 
			
		||||
	public ItemStack[] pArmor;
 | 
			
		||||
@@ -23,7 +22,6 @@ public class PlayerArenaData {
 | 
			
		||||
			ItemStack[] pInventory, ItemStack[] pArmor, Float pEXP,
 | 
			
		||||
			Integer pEXPL, Double pHealth, Integer pFood,
 | 
			
		||||
			Collection<PotionEffect> pPotionEffects, boolean pFlying) {
 | 
			
		||||
		this.pLocation = pLocation;
 | 
			
		||||
		this.pGameMode = pGameMode;
 | 
			
		||||
		this.pInventory = pInventory;
 | 
			
		||||
		this.pArmor = pArmor;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user