Cancel join when closing kit select inventory

AlexMl · Oct 28, 2014 · 79107bb · 79107bb
1 parent e655be4
commit 79107bb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/src/me/Aubli/ZvP/Game/Arena.java b/src/me/Aubli/ZvP/Game/Arena.java
@@ -449,9 +449,9 @@ public void sendMessage(String message) {
 
 	public boolean addPlayer(final ZvPPlayer player){
 
-		ZvP.getPluginLogger().log(Level.FINER, "[ZvP] Player " + player.getName() + " is added?" + containsPlayer(player.getPlayer()) + ", Kit: " + player.hasKit(), true);
+		ZvP.getPluginLogger().log(Level.FINER, "[ZvP] Player " + player.getName() + " inGame: " + GameManager.getManager().isInGame(player.getPlayer()) + ", hasCanceled: " + player.hasCanceled() + " , Kit: " + player.hasKit(), true);
 
-		if(!player.hasKit()) {
+		if(!player.hasKit() && !player.hasCanceled()) {
 
 			if(!containsPlayer(player.getPlayer())) {
 				players.add(player);
@@ -470,7 +470,7 @@ public void run() {
 			players.remove(player);		
 		}		
 
-		if(!players.contains(player)){			
+		if(!players.contains(player) && !player.hasCanceled()){
 			try{
 				player.setStartPosition(getNewRandomLocation()); 
 				player.getReady();

diff --git a/src/me/Aubli/ZvP/Game/ZvPPlayer.java b/src/me/Aubli/ZvP/Game/ZvPPlayer.java
@@ -32,6 +32,7 @@ public class ZvPPlayer {
 	private Location startPosition;
 
 	private boolean voted;
+	private boolean canceled;
 
 	private int zombieKills;
 	private int deaths;
@@ -54,6 +55,7 @@ public ZvPPlayer(Player player, Arena arena, Lobby lobby) throws Exception{
 		this.lobby = lobby;
 
 		this.voted = false;
+		this.canceled = false;
 
 		this.zombieKills = 0;
 		this.deaths = 0;
@@ -168,8 +170,12 @@ private void setPlayerBoard() {
 		getPlayer().setScoreboard(getBoard());
 	}
 
-	public void setVoted(boolean voted) {
-		this.voted = voted;
+	public void setVoted(boolean vote) {
+		this.voted = vote;
+	}
+
+	public void setCanceled(boolean cancel) {
+		this.canceled = cancel;
 	}
 
 
@@ -181,6 +187,10 @@ public boolean hasVoted() {
 		return voted;
 	}
 
+	public boolean hasCanceled() {
+		return canceled;
+	}
+
 
 	public void sendMessage(String message) {
 		getPlayer().sendMessage(message);

diff --git a/src/me/Aubli/ZvP/Listeners/GUIListener.java b/src/me/Aubli/ZvP/Listeners/GUIListener.java
@@ -227,7 +227,9 @@ public void run() {
 
 			if(player!=null) {
 				if(!player.hasKit()) {
-					player.setKit(KitManager.getManager().getKit("No Kit"));
+					player.setCanceled(true);
+					GameManager.getManager().removePlayer(player);
+					//player.setKit(KitManager.getManager().getKit("No Kit"));
 					return;
 				}
 			}