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=2212b7a40f7c254324d65b3feecc98e994dc986e;hp=cf69d7ec9b89db5cb0d9f78c5ab939571c9edf6e;hb=ac632f1a071b3a9d84681041420c260be9d9f1d2;hpb=a1fc73715c4b302f418bca4e1be8ce9272b70d78 diff --git a/src/no/defcon/yavote/Votemanager.java b/src/no/defcon/yavote/Votemanager.java index cf69d7e..2212b7a 100644 --- a/src/no/defcon/yavote/Votemanager.java +++ b/src/no/defcon/yavote/Votemanager.java @@ -41,6 +41,7 @@ public class Votemanager { if ( ! (type.equalsIgnoreCase("sun") || type.equalsIgnoreCase("rain") || + type.equalsIgnoreCase("storm") || type.equalsIgnoreCase("day") || type.equalsIgnoreCase("night") )) { @@ -148,6 +149,8 @@ public class Votemanager { w.setStorm(false); else if ( voteType.equalsIgnoreCase("rain")) w.setStorm(true); + else if ( voteType.equalsIgnoreCase("storm")) + w.setThundering(true); else if ( voteType.equalsIgnoreCase("day")) w.setTime( plugin.getConfig().getInt("vote.time.dayStart") ); else if ( voteType.equalsIgnoreCase("night")) @@ -160,7 +163,7 @@ public class Votemanager { private boolean checkRatio( ) { float required = 0.5F; - if ( voteType.equalsIgnoreCase("sun") || voteType.equalsIgnoreCase("rain") ) + if ( voteType.equalsIgnoreCase("sun") || voteType.equalsIgnoreCase("rain") || voteType.equalsIgnoreCase("storm") ) required = (float)plugin.getConfig().getInt("vote.weather.requiredPercent") / 100.0F; else if ( voteType.equalsIgnoreCase("day") || voteType.equalsIgnoreCase("night") ) required = (float)plugin.getConfig().getInt("vote.time.requiredPercent") / 100.0F;