X-Git-Url: https://git.defcon.no/?p=YAVote;a=blobdiff_plain;f=src%2Fno%2Fdefcon%2Fyavote%2FVotemanager.java;fp=src%2Fno%2Fdefcon%2Fyavote%2FVotemanager.java;h=bacbd92940dac0aabc9537f0d53a180c09c923ef;hp=8690db30732d35f923b6af0f8a40948c136c96ba;hb=739207dfc5e69c48d29249bbebcadf716c28cb23;hpb=ca68e899bfeb6ee4d68b8531d0b36964eda5912e

diff --git a/src/no/defcon/yavote/Votemanager.java b/src/no/defcon/yavote/Votemanager.java
index 8690db3..bacbd92 100644
--- a/src/no/defcon/yavote/Votemanager.java
+++ b/src/no/defcon/yavote/Votemanager.java
@@ -64,7 +64,6 @@ public class Votemanager {
 
 		yesVoters.add(p.getName());
 
-		//if ( checkRatio( ) )
 		if ( ((float) yesVoters.size() / (float) plugin.getServer().getOnlinePlayers().length ) >= getRequired() )
 		{
 			applyVote( voteType );
@@ -107,38 +106,17 @@ public class Votemanager {
 		if ( ! voteRunning || (voteType == null ) )
 			return;
 
-		plugin.getLogger().info("Debugging removeVote() with player: " + player.getName() );
 		if ( yesVoters.contains(player.getName()) )
-		{
 			yesVoters.remove(player.getName());
-			plugin.getLogger().info("Debugging, removeVote() removed YES vote for " + player.getName() );
-		}
 
 		if ( noVoters.contains(player.getName()) )
-		{
 			noVoters.remove(player.getName());
-			plugin.getLogger().info("Debugging, removeVote() removed NO vote for " + player.getName() );
-		}
 
 		if ( yesVoters.size() + noVoters.size() == 0 )
-		{
-			plugin.getLogger().info("Debugging: No voters remaining in lists. Cancel vote.");
 			cancelVote();
-			return;
-		}
-
-		plugin.getLogger().info("Debugging: yesVoters.size()     = "  + yesVoters.size() );
-		plugin.getLogger().info("Debugging: getRequired()        = " + getRequired() );
-		plugin.getLogger().info("Debugging: getOnlinePlayers - 1 = " + (plugin.getServer().getOnlinePlayers().length - 1) );
-		plugin.getLogger().info("Debugging: ratio = " + ( (float) yesVoters.size() / (float) (plugin.getServer().getOnlinePlayers().length - 1) ) );
 
-		//if( checkRatio( ) )
-		if ( ((float) yesVoters.size() / (float) (plugin.getServer().getOnlinePlayers().length - 1) ) >= getRequired() )
-		{
-			plugin.getLogger().info("Debugging: after removing vote, ratio test returns TRUE, applying vote");
+		else if ( ((float) yesVoters.size() / (float) (plugin.getServer().getOnlinePlayers().length - 1) ) >= getRequired() )
 			applyVote( voteType );
-		}
-		plugin.getLogger().info("Returning from removeVote()");
 	}
 
 	public boolean addVote(Player player, boolean yes) 
@@ -154,7 +132,6 @@ public class Votemanager {
 		if (yes == true) yesVoters.add(player.getName());
 		else noVoters.add(player.getName());
 		
-		//if ( (yes == true) && checkRatio( ) )
 		if ( ( yes == true) && ( ((float) yesVoters.size() / (float) plugin.getServer().getOnlinePlayers().length ) >= getRequired() ) )
 		{
 			applyVote( voteType );
@@ -211,27 +188,6 @@ public class Votemanager {
 
 		return req;
 	}
-
-	/*
-	// Original approach...
-	private boolean checkRatio( )
-	{
-		float required = getRequired();
-		float ratio = (float) yesVoters.size() / (float) plugin.getServer().getOnlinePlayers().length;
-		if ( ratio >= required ) return true;
-		return false;
-	}
-
-	// Replacement code
-	private boolean checkRatio( )
-	{
-		if ( ((float) yesVoters.size() / (float) plugin.getServer().getOnlinePlayers().length ) >= getRequired() )
-			return true;
-		return false;
-	}
-
-	// But, trying to do it inline instead
-	*/
 	
 	private void clearState()
 	{