Update version number to 6.17.2

Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.0 to 3.10.1 in /VotingPlugin

VotingPlugin/Resources/Config.yml

@@ -559,6 +559,7 @@ AutoDownload: false
 
 # If false plugin will use offline player UUIDs
 # Keep enabled when mixing uuids (Premium and cracked)
+# More info: https://github.com/BenCodez/VotingPlugin/wiki/Online-Offline-Mode
 OnlineMode: true
 
 # Disable checking on world change
@@ -581,6 +582,9 @@ OfflineVotesLimit:
   # Limit of votes per votesite
   Amount: 5
   
+# Maxium amount of vote points possible, -1 to disable
+LimitVotePoints: -1
+  
 # Default worlds set for all rewards
 DefaultRewardWorlds: []
 
@@ -601,6 +605,10 @@ PreloadSkulls: false
 # Will reduce ram usage (very little) if disabled, but slow GUI speeds when using skulls
 LoadSkulls: true
 
+# If true, skulls will be loaded on GUI even if not cached
+# May result in GUI taking longer to open until skulls are cached
+ForceLoadSkulls: false
+
 ###########################################
 # Extra checks on vote
 ###########################################

VotingPlugin/Resources/GUI.yml

@@ -287,7 +287,6 @@ CHEST:
     Name: 'VoteSite: %site%'
   VoteGUIName: '&cVoteGUI: &c&l%player%'
   VoteRewardName: 'VoteReward'
-  VoteShopName: 'VoteShop'
   
   BackButton:
     Material: 'BARRIER'
@@ -300,78 +299,8 @@ CHEST:
     EndOfGUI: false
     # If true, this item will become an exit button instead
     Exit: false
-
-  VoteShopBackButton: true
-  VoteShopEnabled: true
-  # Hide items in vote shop which user can not buy
-  VoteShopHideLimitedReached: true
-  # Requires above to be false
-  VoteShopLimitReached: '&aYou reached your limit'
-  VoteShopRequireConfirmation: false
-  VoteShopDisabled: '&cVote shop disabled'
-  # If true, shop gui will reopen, updating all placeholders
-  VoteShopReopenGUIOnPurchase: false
-  # VoteShop extra items for display only
-  #VoteShopExtraItems:
-    #Item:
-      #...
-  Shop:
-    # Identifier
-    # Used in placeholders for formats
-    # Do not have spaces in the identifier
-    # Change the identifier for each shop item
-    Diamond:
-      Identifier_Name: 'Diamond'
-      # Item
-      Material: 'DIAMOND'
-      Amount: 1
-      Name: '&4Buy A Diamond'
-      # You can set skulls of the player using the following
-      # Remove the # to enable
-      #Skull: '%Player%'
-      Lore:
-      - '&c&lCost: &c3 Voting Points'
-      # Number of voting points this cost
-      Cost: 3
-      # Permission required, leave blank for no permission
-      Permission: ''
-      # Hide if player doesn't have permission (only if permission is set)
-      HideOnNoPermission: true
-      # Whether or not to keep GUI open after purchase
-      CloseGUI: true
-      # Require confirmation on purchase, overrides global option above
-      RequireConfirmation: false
-      # Overrides other purchase message
-      #PurchaseMessage: 'Thanks for the purchase'
-      # Limit how many times you can buy this
-      #Limit: 3
-      # Reset limit daily/weekly/monthly
-      #Reset:
-        #Daily: false
-        #Weekly: false
-        #Monthly: false
-      # If true, item is not buyable
-      #NotBuyable: false
-      # Rewards to run if player buys successfully
-      Rewards:
-        # Run command on purchase
-        #Commands:
-        #- 'command here'
-        Items:
-          Diamond:
-            Material: 'DIAMOND'
-            Amount: 1    
-
-  ShopConfirmPurchase:
-    Title: 'Confirm Purchase?'
-    YesItem:
-      Material: EMERALD_BLOCK
-      Amount: 1
-      Name: '&aYes'
-    NoItem:
-      Material: BARRIER
-      Amount: 1
-      Name: '&cNo'
+    
+  # VoteShop settings moved to Shop.yml for 6.17 (To be released)
     
             
 BOOK:

VotingPlugin/Resources/Shop.yml

@@ -0,0 +1,77 @@
+VoteShop:
+  Enabled: true
+  Name: 'VoteShop'
+  BackButton: true
+  # Hide items in vote shop which user can not buy
+  HideLimitedReached: true
+  # Requires above to be false
+  LimitReached: '&aYou reached your limit'
+  RequireConfirmation: false
+  Disabled: '&cVote shop disabled'
+  # If true, shop gui will reopen, updating all placeholders
+  ReopenGUIOnPurchase: false
+  
+Shop:
+  # Identifier
+  # Used in placeholders for formats
+  # Do not have spaces in the identifier
+  # Change the identifier for each shop item
+  Diamond:
+    Identifier_Name: 'Diamond'
+    # Item
+    Material: 'DIAMOND'
+    Amount: 1
+    Name: '&4Buy A Diamond'
+    # You can set skulls of the player using the following
+    # Remove the # to enable
+    #Skull: '%Player%'
+    Lore:
+    - '&c&lCost: &c3 Voting Points'
+    # Number of voting points this cost
+    Cost: 3
+    # Permission required, leave blank for no permission
+    Permission: ''
+    # Hide if player doesn't have permission (only if permission is set)
+    HideOnNoPermission: true
+    # Whether or not to keep GUI open after purchase
+    CloseGUI: true
+    # Require confirmation on purchase, overrides global option above
+    RequireConfirmation: false
+    # Overrides other purchase message
+    #PurchaseMessage: 'Thanks for the purchase'
+    # Limit how many times you can buy this
+    #Limit: 3
+    # Reset limit daily/weekly/monthly
+    #Reset:
+      #Daily: false
+      #Weekly: false
+      #Monthly: false
+    # If true, item is not buyable
+    #NotBuyable: false
+    # Rewards to run if player buys successfully
+    Rewards:
+      # Run command on purchase
+      #Commands:
+      #- 'command here'
+      Items:
+        Diamond:
+          Material: 'DIAMOND'
+          Amount: 1    
+            
+# VoteShop extra items for display only
+#ExtraItems:
+  #ItemIdentifier:
+    #...
+      
+ShopConfirmPurchase:
+  Title: 'Confirm Purchase?'
+  YesItem:
+    Material: EMERALD_BLOCK
+    Amount: 1
+    Name: '&aYes'
+  NoItem:
+    Material: BARRIER
+    Amount: 1
+    Name: '&cNo'
+      
+      

VotingPlugin/Resources/SpecialRewards.yml

@@ -65,7 +65,7 @@ VoteParty:
   # Number of votes required to give rewards
   VotesRequired: 20
   # Increase the amount of votes required on each vote party reached
-  #IncreaseVotesRquired: 10
+  #IncreaseVotesRequired: 10
   # If true, players who did not vote to reach the votes required will 
   # recieve the reward
   # If false, only players who voted get rewards

VotingPlugin/Resources/bungeeconfig.yml

@@ -128,6 +128,9 @@ VoteCacheTime: -1
 # Set to -1 to disable
 MaxAmountOfVotesPerDay: -1
 
+# Maxium amount of vote points possible, -1 to disable
+LimitVotePoints: -1
+
 VoteParty:
   # If enabled, will trigger vote party reward 
   # in BungeeSettings.yml under BungeeVotePartyReward
@@ -149,6 +152,7 @@ VoteParty:
 # Online mode for UUIDS
 # Offline mode setups are not fully tested and are not supported currently
 # If using mixed uuids (premium and cracked players leave this enabled and disable UUIDLookup below)
+# More details here: https://github.com/BenCodez/VotingPlugin/wiki/Online-Offline-Mode
 OnlineMode: true
 
 # If true plugin will atempt to lookup uuids if none exist

VotingPlugin/Resources/plugin.yml

@@ -54,9 +54,6 @@ commands:
   voteurl:
     description: Open VoteURL
     aliases: vurl
-  votereward:
-    description: Open VoteReward GUI
-    aliases: vreward
   voteparty:
     description: A command
     aliases: vparty

VotingPlugin/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bencodez</groupId>
 	<artifactId>${version.art}</artifactId>
-	<version>6.16.3</version>
+	<version>6.17.2</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>
@@ -61,7 +61,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.4.1</version>
+				<version>3.4.2</version>
 				<configuration>
 					<archive>
 						<manifestEntries>
@@ -108,6 +108,11 @@
 						</filter>
 					</filters>
 					<relocations>
+						<relocation>
+							<pattern>com.tcoded.folialib</pattern>
+							<shadedPattern>
+								${project.groupId}.votingplugin.simpleapi.folialib</shadedPattern>
+						</relocation>
 						<relocation>
 							<pattern>com.bencodez.simpleapi</pattern>
 							<shadedPattern>
@@ -191,8 +196,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${user.home}/Documents/Test
-								Server/plugins</outputDirectory>
+							<outputDirectory>${user.home}/Documents/Test_Server/plugins</outputDirectory>
 							<resources>
 								<resource>
 									<directory>${basedir}/target</directory>
@@ -243,13 +247,13 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.21-R0.1-SNAPSHOT</version>
+			<version>1.21.1-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.32</version>
+			<version>1.18.34</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -279,7 +283,7 @@
 		<dependency>
 			<groupId>org.bstats</groupId>
 			<artifactId>bstats-velocity</artifactId>
-			<version>3.0.2</version>
+			<version>3.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -382,7 +386,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.1.2</version>
+						<version>3.1.3</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>
@@ -437,7 +441,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.7.0</version>
+						<version>3.10.1</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -489,7 +493,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>3.7.0</version>
+						<version>3.10.1</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -507,7 +511,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-deploy-plugin</artifactId>
-						<version>3.1.2</version>
+						<version>3.1.3</version>
 						<configuration>
 							<skip>true</skip>
 						</configuration>

VotingPlugin/src/com/bencodez/votingplugin/BungeeHandler.java

@@ -167,6 +167,8 @@ public class BungeeHandler implements Listener {
 				plugin.debug("Detected time change from bungee: " + type.toString());
 				plugin.getTimeChecker().forceChanged(type, false, true, true);
 				globalDataHandler.setBoolean(plugin.getBungeeSettings().getServer(), type.toString(), false);
+				getGlobalMessageHandler().sendMessage("TimeChangeFinished",
+						"" + plugin.getBungeeSettings().getServer());
 			}
 		}
 		return isProcessing;

VotingPlugin/src/com/bencodez/votingplugin/VotingPluginMain.java

@@ -71,6 +71,7 @@ import com.bencodez.votingplugin.config.BungeeSettings;
 import com.bencodez.votingplugin.config.Config;
 import com.bencodez.votingplugin.config.ConfigVoteSites;
 import com.bencodez.votingplugin.config.GUI;
+import com.bencodez.votingplugin.config.ShopFile;
 import com.bencodez.votingplugin.config.SpecialRewardsConfig;
 import com.bencodez.votingplugin.cooldown.CoolDownCheck;
 import com.bencodez.votingplugin.data.ServerData;
@@ -144,6 +145,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	@Getter
 	private GUI gui;
 
+	@Getter
+	private ShopFile shopFile;
+
 	@Getter
 	private LinkedHashMap<TopVoterPlayer, Integer> lastMonthTopVoter;
 
@@ -899,27 +903,27 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 					});
 		}
 
-		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
-			addDirectlyDefinedRewards(new DirectlyDefinedReward("CHEST.Shop." + identifier + ".Rewards") {
+		for (String identifier : plugin.getShopFile().getShopIdentifiers()) {
+			addDirectlyDefinedRewards(new DirectlyDefinedReward("Shop." + identifier + ".Rewards") {
 
 				@Override
 				public void createSection(String key) {
-					getGui().createSection(key);
+					getShopFile().createSection(key);
 				}
 
 				@Override
 				public ConfigurationSection getFileData() {
-					return getGui().getData();
+					return getShopFile().getData();
 				}
 
 				@Override
 				public void save() {
-					getGui().saveData();
+					getShopFile().saveData();
 				}
 
 				@Override
 				public void setData(String path, Object value) {
-					getGui().setValue(path, value);
+					getShopFile().setValue(path, value);
 				}
 			});
 		}
@@ -1046,6 +1050,17 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	@Override
 	public void onPostLoad() {
+		// auto conversion for Shop.yml
+		if (plugin.getShopFile().isJustCreated()) {
+			if (!plugin.getGui().isJustCreated() && !getServerData().isVoteShopConverted()) {
+				plugin.getLogger().warning("Converting VoteShop configuration to Shop.yml from GUI.yml");
+				plugin.getShopFile().convertFromGUIFile();
+			}
+			getServerData().setShopConverted(true);
+		} else if (!getServerData().isVoteShopConverted()) {
+			getServerData().setShopConverted(true);
+		}
+
 		loadVersionFile();
 		getOptions().setServer(bungeeSettings.getServer());
 
@@ -1480,6 +1495,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		specialRewardsConfig.reloadData();
 
 		gui.reloadData();
+		shopFile.reloadData();
 
 		bungeeSettings.reloadData();
 
@@ -1539,10 +1555,13 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		bungeeSettings = new BungeeSettings(this);
 		bungeeSettings.setup();
 
+		serverData = new ServerData(this);
+
 		gui = new GUI(this);
 		gui.setup();
 
-		serverData = new ServerData(this);
+		shopFile = new ShopFile(this);
+		shopFile.setup();
 
 		checkYMLError();
 

VotingPlugin/src/com/bencodez/votingplugin/bungee/Config.java

@@ -64,7 +64,7 @@ public class Config {
 	public boolean getOnlineMode() {
 		return getData().getBoolean("OnlineMode", true);
 	}
-	
+
 	public boolean getUUIDLookup() {
 		return getData().getBoolean("UUIDLookup", true);
 	}
@@ -93,6 +93,10 @@ public class Config {
 		return getData().getInt("BungeeServer.Port", 1297);
 	}
 
+	public int getLimitVotePoints() {
+		return getData().getInt("LimitVotePoints", -1);
+	}
+
 	public boolean getDebug() {
 		return getData().getBoolean("Debug", false);
 	}

VotingPlugin/src/com/bencodez/votingplugin/bungee/VotingPluginBungee.java

@@ -382,6 +382,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 					@Override
 					public void onTimeChangedFailed(String server, TimeType type) {
 						getGlobalDataHandler().setBoolean(server, type.toString(), false);
+						getGlobalDataHandler().setBoolean(server, "FinishedProcessing", true);
+						getGlobalDataHandler().setBoolean(server, "Processing", false);
 					}
 				};
 			} else {
@@ -876,6 +878,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 							if (message[0].equalsIgnoreCase("statusokay")) {
 								String server = message[1];
 								getLogger().info("Status okay for " + server);
+							} else if (message[0].equalsIgnoreCase("TimeChangeFinished")) {
+
 							} else if (message[0].equalsIgnoreCase("login")) {
 								String player = message[1];
 								String uuid = message[2];
@@ -1183,6 +1187,8 @@ public class VotingPluginBungee extends Plugin implements Listener {
 				String server = in.readUTF();
 				getLogger().info("Status okay for " + server);
 				return;
+			} else if (subchannel.equalsIgnoreCase("TimeChangeFinished")) {
+
 			} else if (subchannel.equalsIgnoreCase("login")) {
 				String player = in.readUTF();
 				String uuid = in.readUTF();
@@ -1436,6 +1442,12 @@ public class VotingPluginBungee extends Plugin implements Listener {
 							monthTotal = days * maxVotes;
 						}
 					}
+
+					if (getConfig().getLimitVotePoints() > 0) {
+						if (points > getConfig().getLimitVotePoints()) {
+							points = getConfig().getLimitVotePoints();
+						}
+					}
 					text = new BungeeMessageData(allTimeTotal, monthTotal, weeklyTotal, dailyTotal, points,
 							milestoneCount, votePartyVotes, currentVotePartyVotesRequired);
 					ArrayList<Column> update = new ArrayList<Column>();

VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/Config.java

@@ -36,7 +36,7 @@ public class Config extends VelocityYMLFile {
 	public boolean getOnlineMode() {
 		return getBoolean(getNode("OnlineMode"), true);
 	}
-	
+
 	public boolean getUUIDLookup() {
 		return getBoolean(getNode("UUIDLookup"), true);
 	}
@@ -65,6 +65,10 @@ public class Config extends VelocityYMLFile {
 		return getInt(getNode("Redis", "Port"), 6379);
 	}
 
+	public int getLimitVotePoints() {
+		return getInt(getNode("LimitVotePoints"), -1);
+	}
+
 	public String getRedisUsername() {
 		return getString(getNode("Redis", "Username"), "");
 	}

VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VoteCache.java

@@ -40,32 +40,29 @@ public class VoteCache extends VelocityJSONFile {
 	}
 
 	public void addVote(String server, int num, OfflineBungeeVote voteData) {
-		String[] path = new String[] { "VoteCache", server, "" + num };
 
-		getNode(path, "Name").setValue(voteData.getPlayerName());
-		getNode(path, "Service").setValue(voteData.getService());
-		getNode(path, "UUID").setValue(voteData.getUuid());
-		getNode(path, "Time").setValue(voteData.getTime());
-		getNode(path, "Real").setValue(voteData.isRealVote());
-		getNode(path, "Text").setValue(voteData.getText());
+		getNode("VoteCache", server, "" + num, "Name").setValue(voteData.getPlayerName());
+		getNode("VoteCache", server, "" + num, "Service").setValue(voteData.getService());
+		getNode("VoteCache", server, "" + num, "UUID").setValue(voteData.getUuid());
+		getNode("VoteCache", server, "" + num, "Time").setValue(voteData.getTime());
+		getNode("VoteCache", server, "" + num, "Real").setValue(voteData.isRealVote());
+		getNode("VoteCache", server, "" + num, "Text").setValue(voteData.getText());
 	}
 
 	public void addTimedVote(int num, VoteTimeQueue voteTimedQueue) {
-		String[] path = new String[] { "TimedVoteCache", "" + num };
-		getNode(path, "Name").setValue(voteTimedQueue.getName());
-		getNode(path, "Service").setValue(voteTimedQueue.getService());
-		getNode(path, "Time").setValue(voteTimedQueue.getTime());
+		getNode("TimedVoteCache", "" + num, "Name").setValue(voteTimedQueue.getName());
+		getNode("TimedVoteCache", "" + num, "Service").setValue(voteTimedQueue.getService());
+		getNode("TimedVoteCache", "" + num, "Time").setValue(voteTimedQueue.getTime());
 	}
 
 	public void addVoteOnline(String player, int num, OfflineBungeeVote voteData) {
-		String[] path = new String[] { "OnlineCache", player, "" + num };
 
-		getNode(path, "Name").setValue(voteData.getPlayerName());
-		getNode(path, "Service").setValue(voteData.getService());
-		getNode(path, "UUID").setValue(voteData.getUuid());
-		getNode(path, "Time").setValue(voteData.getTime());
-		getNode(path, "Real").setValue(voteData.isRealVote());
-		getNode(path, "Text").setValue(voteData.getText());
+		getNode("OnlineCache", player, "" + num, "Name").setValue(voteData.getPlayerName());
+		getNode("OnlineCache", player, "" + num, "Service").setValue(voteData.getService());
+		getNode("OnlineCache", player, "" + num, "UUID").setValue(voteData.getUuid());
+		getNode("OnlineCache", player, "" + num, "Time").setValue(voteData.getTime());
+		getNode("OnlineCache", player, "" + num, "Real").setValue(voteData.isRealVote());
+		getNode("OnlineCache", player, "" + num, "Text").setValue(voteData.getText());
 	}
 
 	public void clearData() {
@@ -99,7 +96,7 @@ public class VoteCache extends VelocityJSONFile {
 	}
 
 	public Collection<String> getServerVotes(String server) {
-		return getKeys(getNode("OnlineCache", server));
+		return getKeys(getNode("VoteCache", server));
 	}
 
 	public ConfigurationNode getServerVotes(String server, String num) {

VotingPlugin/src/com/bencodez/votingplugin/bungee/velocity/VotingPluginVelocity.java

@@ -387,6 +387,8 @@ public class VotingPluginVelocity {
 					@Override
 					public void onTimeChangedFailed(String server, TimeType type) {
 						getGlobalDataHandler().setBoolean(server, type.toString(), false);
+						getGlobalDataHandler().setBoolean(server, "FinishedProcessing", true);
+						getGlobalDataHandler().setBoolean(server, "Processing", false);
 					}
 				};
 			} else {
@@ -497,9 +499,17 @@ public class VotingPluginVelocity {
 					String server = in.readUTF();
 					logger.info("Status okay for " + server);
 					return;
+				} else if (subchannel.equalsIgnoreCase("TimeChangeFinished")) {
+
 				} else if (subchannel.equalsIgnoreCase("login")) {
+
 					String player = in.readUTF();
-					debug("Login: " + player);
+					String uuid = in.readUTF();
+					String serverName = "";
+					if (size > 2) {
+						serverName = in.readUTF();
+					}
+					debug("Login: " + player + "/" + uuid + " " + serverName);
 					if (server.getPlayer(player).isPresent()
 							&& (getGlobalDataHandler() == null || !getGlobalDataHandler().isTimeChangedHappened())) {
 						Player p = server.getPlayer(player).get();
@@ -510,6 +520,8 @@ public class VotingPluginVelocity {
 
 								@Override
 								public void run() {
+									debug("Checking offline votes for " + p.getUsername() + "/"
+											+ p.getUniqueId().toString());
 									checkCachedVotes(server);
 									checkOnlineVotes(p1, p.getUniqueId().toString(), server);
 									getMultiProxyHandler().login(p1.getUniqueId().toString(), p1.getUsername());
@@ -694,6 +706,7 @@ public class VotingPluginVelocity {
 					}
 
 				}
+				globalDataHandler.onTimeChange(type);
 			}
 
 			@Override
@@ -842,7 +855,7 @@ public class VotingPluginVelocity {
 							vote.add(new OfflineBungeeVote(data.getNode("Name").getString(),
 									data.getNode("UUID").getString(), data.getNode("Service").getString(),
 									data.getNode("Time").getLong(), data.getNode("Real").getBoolean(),
-									data.getNode("TEXT").getString()));
+									data.getNode("Text").getString()));
 						}
 						cachedVotes.put(server.getServer(serverToCheck).get(), vote);
 					}
@@ -858,7 +871,7 @@ public class VotingPluginVelocity {
 							vote.add(new OfflineBungeeVote(data.getNode("Name").getString(),
 									data.getNode("UUID").getString(), data.getNode("Service").getString(),
 									data.getNode("Time").getLong(), data.getNode("Real").getBoolean(),
-									data.getNode("TEXT").getString()));
+									data.getNode("Text").getString()));
 						}
 						cachedOnlineVotes.put(player, vote);
 					}
@@ -952,6 +965,8 @@ public class VotingPluginVelocity {
 							if (message[0].equalsIgnoreCase("statusokay")) {
 								String server = message[1];
 								getLogger().info("Status okay for " + server);
+							} else if (message[0].equalsIgnoreCase("TimeChangeFinished")) {
+
 							} else if (message[0].equalsIgnoreCase("login")) {
 								String player = message[1];
 								String uuid = message[2];
@@ -1496,6 +1511,11 @@ public class VotingPluginVelocity {
 							monthTotal = days * maxVotes;
 						}
 					}
+					if (getConfig().getLimitVotePoints() > 0) {
+						if (points > getConfig().getLimitVotePoints()) {
+							points = getConfig().getLimitVotePoints();
+						}
+					}
 					text = new BungeeMessageData(allTimeTotal, monthTotal, weeklyTotal, dailyTotal, points,
 							milestoneCount, votePartyVotes, currentVotePartyVotesRequired);
 					ArrayList<Column> update = new ArrayList<Column>();

VotingPlugin/src/com/bencodez/votingplugin/commands/CommandLoader.java

@@ -1600,7 +1600,7 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
 						plugin.getRewardHandler().giveReward(user, plugin.getConfigFile().getData(),
-								plugin.getGui().getChestShopIdentifierRewardsPath(args[3]), new RewardOptions());
+								plugin.getShopFile().getShopIdentifierRewardsPath(args[3]), new RewardOptions());
 						sendMessage(sender, "&cVoteShop " + args[3] + " forced");
 					}
 				});
@@ -2106,7 +2106,7 @@ public class CommandLoader {
 			@Override
 			public void reload() {
 				ArrayList<String> sites = new ArrayList<String>();
-				for (String str : plugin.getGui().getChestShopIdentifiers()) {
+				for (String str : plugin.getShopFile().getShopIdentifiers()) {
 					sites.add(str);
 				}
 				setReplace(sites);
@@ -2187,7 +2187,7 @@ public class CommandLoader {
 			}
 		});
 
-		if (plugin.getGui().isChestVoteShopEnabled()) {
+		if (plugin.getShopFile().isVoteShopEnabled()) {
 			plugin.getVoteCommand().add(new CommandHandler(plugin, new String[] { "Shop" },
 					"VotingPlugin.Commands.Vote.Shop|" + playerPerm, "Open VoteShop GUI", false) {
 
@@ -2202,13 +2202,13 @@ public class CommandLoader {
 
 				@Override
 				public void execute(CommandSender sender, String[] args) {
-					if (!plugin.getGui().isChestVoteShopEnabled()) {
+					if (!plugin.getShopFile().isVoteShopEnabled()) {
 						sender.sendMessage(MessageAPI.colorize("&cVote shop disabled"));
 						return;
 					}
 
 					String identifier = args[1];
-					Set<String> identifiers = plugin.getGui().getChestShopIdentifiers();
+					Set<String> identifiers = plugin.getShopFile().getShopIdentifiers();
 					if (ArrayUtils.containsIgnoreCase(identifiers, identifier)) {
 						for (String ident : identifiers) {
 							if (ident.equalsIgnoreCase(args[1])) {
@@ -2216,7 +2216,7 @@ public class CommandLoader {
 							}
 						}
 
-						String perm = plugin.getGui().getChestVoteShopPermission(identifier);
+						String perm = plugin.getShopFile().getVoteShopPermission(identifier);
 						boolean hasPerm = false;
 						if (perm.isEmpty()) {
 							hasPerm = true;
@@ -2224,7 +2224,7 @@ public class CommandLoader {
 							hasPerm = sender.hasPermission(perm);
 						}
 
-						int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
+						int limit = plugin.getShopFile().getShopIdentifierLimit(identifier);
 
 						VotingPluginUser user = plugin.getVotingPluginUserManager()
 								.getVotingPluginUser(sender.getName());
@@ -2236,12 +2236,12 @@ public class CommandLoader {
 							}
 						}
 
-						if (!plugin.getGui().getChestVoteShopNotBuyable(identifier)) {
+						if (!plugin.getShopFile().getVoteShopNotBuyable(identifier)) {
 							if (hasPerm) {
 								if (plugin.getConfigFile().isExtraVoteShopCheck()) {
 									user.cache();
 								}
-								int points = plugin.getGui().getChestShopIdentifierCost(identifier);
+								int points = plugin.getShopFile().getShopIdentifierCost(identifier);
 								if (identifier != null) {
 
 									if (limitPass) {
@@ -2251,8 +2251,8 @@ public class CommandLoader {
 										placeholders.put("limit", "" + limit);
 										if (user.removePoints(points, true)) {
 
-											plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
-													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
+											plugin.getRewardHandler().giveReward(user, plugin.getShopFile().getData(),
+													plugin.getShopFile().getShopIdentifierRewardsPath(identifier),
 													new RewardOptions().setPlaceholders(placeholders));
 
 											user.sendMessage(PlaceholderUtils.replacePlaceHolder(
@@ -2266,7 +2266,7 @@ public class CommandLoader {
 													plugin.getConfigFile().getFormatShopFailedMsg(), placeholders));
 										}
 									} else {
-										user.sendMessage(plugin.getGui().getChestVoteShopLimitReached());
+										user.sendMessage(plugin.getShopFile().getVoteShopLimitReached());
 									}
 								}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShop.java

@@ -59,7 +59,7 @@ public class AdminVoteVoteShop extends GUIHandler {
 
 					@Override
 					public void onInput(Player player, String value) {
-						plugin.getGui().createShop(value);
+						plugin.getShopFile().createShop(value);
 						plugin.reload();
 					}
 				});

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShopItem.java

@@ -53,7 +53,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
 		// to add
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.PAPER, 1), new EditGUIValueString("Identifier_Name",
-				plugin.getGui().getChestShopIdentifierIdentifierName(identifier)) {
+				plugin.getShopFile().getShopIdentifierIdentifierName(identifier)) {
 
 			@Override
 			public void setValue(Player player, String name) {
@@ -61,7 +61,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 			}
 		}));
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.OAK_DOOR, 1),
-				new EditGUIValueString("Permission", plugin.getGui().getChestVoteShopPermission(identifier)) {
+				new EditGUIValueString("Permission", plugin.getShopFile().getVoteShopPermission(identifier)) {
 
 					@Override
 					public void setValue(Player player, String name) {
@@ -69,7 +69,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 					}
 				}));
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.EMERALD, 1),
-				new EditGUIValueNumber("Cost", plugin.getGui().getChestShopIdentifierCost(identifier)) {
+				new EditGUIValueNumber("Cost", plugin.getShopFile().getShopIdentifierCost(identifier)) {
 
 					@Override
 					public void setValue(Player player, Number num) {
@@ -77,7 +77,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 					}
 				}));
 		inv.addButton(new EditGUIButton(new ItemBuilder(Material.BARRIER, 1),
-				new EditGUIValueNumber("Limit", plugin.getGui().getChestShopIdentifierLimit(identifier)) {
+				new EditGUIValueNumber("Limit", plugin.getShopFile().getShopIdentifierLimit(identifier)) {
 
 					@Override
 					public void setValue(Player player, Number num) {
@@ -86,7 +86,7 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 				}));
 
 		// display item
-		ConfigurationSection displayItemData = plugin.getGui().getChestShopIdentifierSection(identifier);
+		ConfigurationSection displayItemData = plugin.getShopFile().getShopIdentifierSection(identifier);
 		inv.addButton(new EditGUIButton(new ItemBuilder(displayItemData.getString("Material")).setAmount(1),
 				new EditGUIValueString("Material", displayItemData.getString("Material")) {
 
@@ -156,8 +156,8 @@ public class AdminVoteVoteShopItem extends GUIHandler {
 	}
 
 	private void setPathData(String path, Object value) {
-		plugin.getGui().getData().set("CHEST.Shop." + identifier + "." + path, value);
-		plugin.getGui().saveData();
+		plugin.getShopFile().getData().set("Shop." + identifier + "." + path, value);
+		plugin.getShopFile().saveData();
 		plugin.reload();
 	}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShopItemRemove.java

@@ -42,9 +42,9 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 		BInventory inv = new BInventory("Edit VoteShop Remove Item");
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
 
-		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
+		for (final String identifier : plugin.getShopFile().getShopIdentifiers()) {
 			inv.addButton(
-					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))
+					new BInventoryButton(new ItemBuilder(plugin.getShopFile().getShopIdentifierSection(identifier))
 							.addLoreLine("&c&lClick to remove")) {
 
 						@Override
@@ -54,7 +54,7 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 
 								@Override
 								public void onConfirm(Player p) {
-									plugin.getGui().removeShop(identifier);
+									plugin.getShopFile().removeShop(identifier);
 									p.sendMessage("Removed " + identifier);
 									plugin.reload();
 								}
@@ -65,7 +65,6 @@ public class AdminVoteVoteShopItemRemove extends GUIHandler {
 								}
 							}.open();
 
-
 						}
 					}.addData("ident", identifier));
 		}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/admin/voteshop/AdminVoteVoteShopItems.java

@@ -41,9 +41,9 @@ public class AdminVoteVoteShopItems extends GUIHandler {
 		BInventory inv = new BInventory("Edit VoteShop Items");
 		inv.requirePermission("VotingPlugin.Commands.AdminVote.Edit.VoteShop");
 
-		for (String identifier : plugin.getGui().getChestShopIdentifiers()) {
+		for (String identifier : plugin.getShopFile().getShopIdentifiers()) {
 			inv.addButton(
-					new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier))) {
+					new BInventoryButton(new ItemBuilder(plugin.getShopFile().getShopIdentifierSection(identifier))) {
 
 						@Override
 						public void onClick(ClickEvent clickEvent) {

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteShop.java

@@ -46,8 +46,8 @@ public class VoteShop extends GUIHandler {
 
 	@Override
 	public void onChest(Player player) {
-		if (!plugin.getGui().isChestVoteShopEnabled()) {
-			player.sendMessage(MessageAPI.colorize(plugin.getGui().getChestVoteShopDisabled()));
+		if (!plugin.getShopFile().isVoteShopEnabled()) {
+			player.sendMessage(MessageAPI.colorize(plugin.getShopFile().getVoteShopDisabled()));
 			return;
 		}
 
@@ -58,26 +58,33 @@ public class VoteShop extends GUIHandler {
 		/*
 		 * if (!plugin.getConfigFile().isExtraVoteShopCheck()) { user.cacheAsync(); }
 		 */
-		BInventory inv = new BInventory(plugin.getGui().getChestVoteShopName());
+		BInventory inv = new BInventory(plugin.getShopFile().getVoteShopName());
 		inv.addPlaceholder("points", "" + user.getPoints());
 		inv.addPlaceholder("sitesavailable", "" + user.getSitesNotVotedOn());
 		inv.dontClose();
 
-		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
+		for (final String identifier : plugin.getShopFile().getShopIdentifiers()) {
 
-			String perm = plugin.getGui().getChestVoteShopPermission(identifier);
+			String perm = plugin.getShopFile().getVoteShopPermission(identifier);
 			boolean hasPerm = false;
 			if (perm.isEmpty()) {
 				hasPerm = true;
 			} else {
+				String p = "";
 				if (perm.startsWith("!")) {
-					hasPerm = !player.hasPermission(perm.substring(1));
+					p = PlaceholderUtils.replacePlaceHolders(player, perm.substring(1));
+					hasPerm = !player.hasPermission(p);
 				} else {
-					hasPerm = player.hasPermission(perm);
+					p = PlaceholderUtils.replacePlaceHolders(player, perm);
+					hasPerm = player.hasPermission(p);
+				}
+				if (!hasPerm) {
+					plugin.extraDebug("VoteShop: " + player.getName() + "/" + player.getUniqueId()
+							+ " does not have permission `" + p + "` for " + identifier);
 				}
 			}
 
-			int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
+			int limit = plugin.getShopFile().getShopIdentifierLimit(identifier);
 
 			boolean limitPass = true;
 			if (limit > 0) {
@@ -86,10 +93,10 @@ public class VoteShop extends GUIHandler {
 				}
 			}
 
-			if (!plugin.getGui().getChestVoteShopNotBuyable(identifier)) {
-				if ((hasPerm || !plugin.getGui().getChestVoteShopHideOnNoPermission(identifier))
-						&& (limitPass || !plugin.getGui().isChestVoteShopHideLimitedReached())) {
-					ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier));
+			if (!plugin.getShopFile().getVoteShopNotBuyable(identifier)) {
+				if ((hasPerm || !plugin.getShopFile().getVoteShopHideOnNoPermission(identifier))
+						&& (limitPass || !plugin.getShopFile().isVoteShopHideLimitedReached())) {
+					ItemBuilder builder = new ItemBuilder(plugin.getShopFile().getShopIdentifierSection(identifier));
 
 					inv.addButton(new BInventoryButton(builder) {
 
@@ -104,7 +111,7 @@ public class VoteShop extends GUIHandler {
 
 							String identifier = (String) getData("identifier");
 							int limit = (int) getData("Limit");
-							int points = plugin.getGui().getChestShopIdentifierCost(identifier);
+							int points = plugin.getShopFile().getShopIdentifierCost(identifier);
 							if (identifier != null) {
 								// if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
 								// event.closeInventory();
@@ -119,10 +126,10 @@ public class VoteShop extends GUIHandler {
 								}
 
 								if (limitPass) {
-									if (!plugin.getGui().isChestVoteShopRequireConfirmation(identifier)) {
+									if (!plugin.getShopFile().isVoteShopRequireConfirmation(identifier)) {
 										HashMap<String, String> placeholders = new HashMap<String, String>();
 										placeholders.put("identifier",
-												plugin.getGui().getChestShopIdentifierIdentifierName(identifier));
+												plugin.getShopFile().getShopIdentifierIdentifierName(identifier));
 										placeholders.put("points", "" + points);
 										placeholders.put("limit", "" + limit);
 										if (user.removePoints(points, true)) {
@@ -132,12 +139,12 @@ public class VoteShop extends GUIHandler {
 												plugin.getServerData().addVoteShopPurchase(identifier);
 											}
 
-											plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
-													plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
+											plugin.getRewardHandler().giveReward(user, plugin.getShopFile().getData(),
+													plugin.getShopFile().getShopIdentifierRewardsPath(identifier),
 													new RewardOptions().setPlaceholders(placeholders));
 
 											user.sendMessage(PlaceholderUtils.replacePlaceHolder(
-													plugin.getGui().getCHESTVoteShopPurchase(identifier),
+													plugin.getShopFile().getVoteShopPurchase(identifier),
 													placeholders));
 											if (limit > 0) {
 												user.setVoteShopIdentifierLimit(identifier,
@@ -159,10 +166,10 @@ public class VoteShop extends GUIHandler {
 
 									}
 								} else {
-									user.sendMessage(plugin.getGui().getChestVoteShopLimitReached());
+									user.sendMessage(plugin.getShopFile().getVoteShopLimitReached());
 								}
 								plugin.getCommandLoader().processSlotClick(player, user, identifier);
-								if (plugin.getGui().isChestVoteShopReopenGUIOnPurchase()) {
+								if (plugin.getShopFile().isVoteShopReopenGUIOnPurchase()) {
 									plugin.getCommandLoader().processSlotClick(player, user, "shop");
 								}
 							}
@@ -172,7 +179,7 @@ public class VoteShop extends GUIHandler {
 				}
 			} else {
 				if (hasPerm) {
-					ItemBuilder builder = new ItemBuilder(plugin.getGui().getChestShopIdentifierSection(identifier));
+					ItemBuilder builder = new ItemBuilder(plugin.getShopFile().getShopIdentifierSection(identifier));
 					inv.addButton(new BInventoryButton(builder) {
 
 						@Override
@@ -185,20 +192,20 @@ public class VoteShop extends GUIHandler {
 			}
 		}
 
-		for (final String str : plugin.getGui().getChestGUIVoteShopExtraItems()) {
-			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestGUIVoteShopExtraItems(str))) {
+		for (final String str : plugin.getShopFile().getVoteShopExtraItems()) {
+			inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getShopFile().getGUIVoteShopExtraItems(str))) {
 
 				@Override
 				public void onClick(ClickEvent clickEvent) {
 					plugin.getCommandLoader().processSlotClick(player, user, str);
-					new RewardBuilder(plugin.getGui().getData(),
-							"CHEST.VoteShopExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
+					new RewardBuilder(plugin.getShopFile().getData(),
+							"ExtraItems." + str + "." + clickEvent.getButton().getLastRewardsPath(player))
 							.setGiveOffline(false).send(clickEvent.getPlayer());
 				}
 			});
 		}
 
-		if (plugin.getGui().isChestVoteShopBackButton()) {
+		if (plugin.getShopFile().isVoteShopBackButton()) {
 			inv.addButton(plugin.getCommandLoader().getBackButton(user));
 		}
 

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteShopConfirm.java

@@ -47,15 +47,15 @@ public class VoteShopConfirm extends GUIHandler {
 	@Override
 	public void onChest(Player player) {
 		PlayerUtils.setPlayerMeta(plugin, player, "ident", identifier);
-		BInventory inv = new BInventory(plugin.getGui().getChestShopConfirmPurchaseTitle());
+		BInventory inv = new BInventory(plugin.getShopFile().getShopConfirmPurchaseTitle());
 		inv.dontClose();
-		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopConfirmPurchaseYesItem())) {
+		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getShopFile().getShopConfirmPurchaseYesItem())) {
 
 			@Override
 			public void onClick(ClickEvent event) {
 				user.cache();
-				int points = plugin.getGui().getChestShopIdentifierCost(identifier);
-				int limit = plugin.getGui().getChestShopIdentifierLimit(identifier);
+				int points = plugin.getShopFile().getShopIdentifierCost(identifier);
+				int limit = plugin.getShopFile().getShopIdentifierLimit(identifier);
 				HashMap<String, String> placeholders = new HashMap<String, String>();
 				placeholders.put("identifier", identifier);
 				placeholders.put("points", "" + points);
@@ -67,12 +67,12 @@ public class VoteShopConfirm extends GUIHandler {
 						plugin.getServerData().addVoteShopPurchase(identifier);
 					}
 
-					plugin.getRewardHandler().giveReward(user, plugin.getGui().getData(),
-							plugin.getGui().getChestShopIdentifierRewardsPath(identifier),
+					plugin.getRewardHandler().giveReward(user, plugin.getShopFile().getData(),
+							plugin.getShopFile().getShopIdentifierRewardsPath(identifier),
 							new RewardOptions().setPlaceholders(placeholders));
 
 					user.sendMessage(PlaceholderUtils
-							.replacePlaceHolder(plugin.getGui().getCHESTVoteShopPurchase(identifier), placeholders));
+							.replacePlaceHolder(plugin.getShopFile().getVoteShopPurchase(identifier), placeholders));
 					if (limit > 0) {
 						user.setVoteShopIdentifierLimit(identifier, user.getVoteShopIdentifierLimit(identifier) + 1);
 					}
@@ -80,7 +80,7 @@ public class VoteShopConfirm extends GUIHandler {
 					user.sendMessage(PlaceholderUtils
 							.replacePlaceHolder(plugin.getConfigFile().getFormatShopFailedMsg(), placeholders));
 				}
-				if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
+				if (plugin.getShopFile().getVoteShopCloseGUI(identifier)) {
 					event.getButton().getInv().closeInv(player, null);
 				} else {
 					new VoteShop(plugin, event.getPlayer(), user).open();
@@ -88,11 +88,11 @@ public class VoteShopConfirm extends GUIHandler {
 
 			}
 		});
-		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getGui().getChestShopConfirmPurchaseNoItem())) {
+		inv.addButton(new BInventoryButton(new ItemBuilder(plugin.getShopFile().getShopConfirmPurchaseNoItem())) {
 
 			@Override
 			public void onClick(ClickEvent event) {
-				if (plugin.getGui().getChestVoteShopCloseGUI(identifier)) {
+				if (plugin.getShopFile().getVoteShopCloseGUI(identifier)) {
 					event.getButton().getInv().closeInv(player, null);
 				} else {
 					new VoteShop(plugin, event.getPlayer(), user).open();

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteToday.java

@@ -97,7 +97,7 @@ public class VoteToday extends GUIHandler {
 				msg = PlaceholderUtils.replacePlaceHolder(msg, placeholders);
 				ItemBuilder item = null;
 				if (plugin.getGui().isChestVoteTodayUseSkull() && !NMSManager.getInstance().isVersion("1.12")) {
-					item = new ItemBuilder(user.getPlayerHead());
+					item = new ItemBuilder(user.getPlayerHead(plugin.getConfigFile().isForceLoadSkulls()));
 				} else {
 					item = new ItemBuilder(plugin.getGui().getChestVoteTodayPlayerItem());
 				}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteTopVoter.java

@@ -104,7 +104,8 @@ public class VoteTopVoter extends GUIHandler {
 				ItemBuilder playerItem = new ItemBuilder(Material.PAPER);
 
 				if (plugin.getGui().isChestVoteTopUseSkull()) {
-					playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
+					playerItem = new ItemBuilder(
+							entry.getKey().getPlayerHead(plugin.getConfigFile().isForceLoadSkulls()));
 				} else {
 					playerItem = new ItemBuilder(Material.valueOf(plugin.getGui().getChestVoteTopPlayerItemMaterial()));
 				}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteTopVoterLastMonth.java

@@ -60,7 +60,7 @@ public class VoteTopVoterLastMonth extends GUIHandler {
 			ItemBuilder playerItem;
 
 			if (plugin.getGui().isChestVoteTopUseSkull()) {
-				playerItem = new ItemBuilder(entry.getKey().getPlayerHead());
+				playerItem = new ItemBuilder(entry.getKey().getPlayerHead(plugin.getConfigFile().isForceLoadSkulls()));
 			} else {
 				playerItem = new ItemBuilder(Material.valueOf(plugin.getGui().getChestVoteTopPlayerItemMaterial()));
 			}

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteURL.java

@@ -157,8 +157,8 @@ public class VoteURL extends GUIHandler {
 		for (VoteSite site : plugin.getVoteSitesEnabled()) {
 			if (!site.isHidden()) {
 				if (site.getPermissionToView().isEmpty() || player.hasPermission(site.getPermissionToView())) {
-					Layout layout = new Layout(plugin.getGui().getBookVoteURLBookGUILayout()).addPlaceholder("sitename",
-							site.getDisplayName());
+					Layout layout = new Layout(plugin.getGui().getBookVoteURLBookGUILayout())
+							.addPlaceholder("sitename", site.getDisplayName()).addPlaceholder("num", "" + i);
 					String text = plugin.getGui().getBookVoteURLBookGUIAlreadyVotedText();
 					ChatColor color = ChatColor.valueOf(plugin.getGui().getBookVoteURLBookGUIAlreadyVotedColor());
 					if (user.canVoteSite(site)) {

VotingPlugin/src/com/bencodez/votingplugin/config/Config.java

@@ -47,6 +47,14 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean perSiteCoolDownEvents = false;
 
+	@ConfigDataBoolean(path = "ForceLoadSkulls")
+	@Getter
+	private boolean forceLoadSkulls = false;
+
+	@ConfigDataInt(path = "LimitVotePoints")
+	@Getter
+	private int limitVotePoints = -1;
+
 	@ConfigDataBoolean(path = "QueueVotesDuringTimeChange")
 	@Getter
 	private boolean queueVotesDuringTimeChange = false;

VotingPlugin/src/com/bencodez/votingplugin/config/GUI.java

@@ -56,34 +56,6 @@ public class GUI extends YMLFile {
 	@Getter
 	private String bookVoteURLBookGUITitle = "&cVoteURL";
 
-	@Getter
-	@ConfigDataConfigurationSection(path = "CHEST.ShopConfirmPurchase.NoItem")
-	private ConfigurationSection chestShopConfirmPurchaseNoItem;
-
-	@Getter
-	@ConfigDataString(path = "CHEST.ShopConfirmPurchase.Title")
-	private String chestShopConfirmPurchaseTitle = "Confirm Purchase?";
-
-	@Getter
-	@ConfigDataConfigurationSection(path = "CHEST.ShopConfirmPurchase.YesItem")
-	private ConfigurationSection chestShopConfirmPurchaseYesItem;
-
-	@Getter
-	@ConfigDataString(path = "CHEST.VoteShopDisabled")
-	private String chestVoteShopDisabled = "&cVote shop disabled";
-
-	@ConfigDataBoolean(path = "CHEST.VoteShopHideLimitedReached")
-	@Getter
-	private boolean chestVoteShopHideLimitedReached = true;
-
-	@ConfigDataString(path = "CHEST.VoteShopLimitReached")
-	@Getter
-	private String chestVoteShopLimitReached = "&aYou reached your limit";
-
-	@ConfigDataBoolean(path = "CHEST.VoteShopRequireConfirmation")
-	@Getter
-	private boolean chestVoteShopRequireConfirmation = false;
-
 	@ConfigDataBoolean(path = "CHEST.VoteBest.BackButton")
 	@Getter
 	private boolean chestVoteBestBackButton = true;
@@ -167,54 +139,10 @@ public class GUI extends YMLFile {
 		this.plugin = plugin;
 	}
 
-	public void createShop(String value) {
-		ConfigurationSection shopData = getData().createSection("CHEST.Shop." + value);
-		shopData.set("Identifier_Name", value);
-		shopData.set("Material", "STONE");
-		shopData.set("Amount", 1);
-		shopData.set("Name", "&cPlaceholder item");
-		shopData.set("Cost", 1);
-		shopData.set("Permission", "");
-		shopData.set("CloseGUI", true);
-		shopData.set("RequireConfirmation", false);
-
-		shopData.set("Rewards.Items.Item1.Material", "STONE");
-		shopData.set("Rewards.Items.Item1.Amount", 1);
-		saveData();
-	}
-
 	@ConfigDataConfigurationSection(path = "CHEST.BackButton")
 	@Getter
 	private ConfigurationSection CHESTBackButton;
 
-	public int getChestShopIdentifierCost(String identifier) {
-		return getData().getInt("CHEST.Shop." + identifier + ".Cost");
-	}
-
-	public String getChestShopIdentifierIdentifierName(String identifier) {
-		return getData().getString("CHEST.Shop." + identifier + ".Identifier_Name", identifier);
-	}
-
-	public int getChestShopIdentifierLimit(String identifier) {
-		return getData().getInt("CHEST.Shop." + identifier + ".Limit", -1);
-	}
-
-	public String getChestShopIdentifierRewardsPath(String identifier) {
-		return "CHEST.Shop." + identifier + ".Rewards";
-	}
-
-	public Set<String> getChestShopIdentifiers() {
-		ConfigurationSection shop = getData().getConfigurationSection("CHEST.Shop");
-		if (shop != null) {
-			return shop.getKeys(false);
-		}
-		return new HashSet<String>();
-	}
-
-	public ConfigurationSection getChestShopIdentifierSection(String identifier) {
-		return getData().getConfigurationSection("CHEST.Shop." + identifier);
-	}
-
 	@ConfigDataConfigurationSection(path = "CHEST.VoteBest.DayBest.Item")
 	@Getter
 	private ConfigurationSection chestVoteBestDayBestItem;
@@ -246,6 +174,10 @@ public class GUI extends YMLFile {
 		return getData().getString("CHEST.VoteGUI." + slot + ".Command", "");
 	}
 
+	public ConfigurationSection getChestGUIExtraItemsItem(String gui, String item) {
+		return getData().getConfigurationSection("CHEST." + gui + ".ExtraItems." + item);
+	}
+
 	/**
 	 * Gets the vote GUI slot lore.
 	 *
@@ -315,55 +247,6 @@ public class GUI extends YMLFile {
 	@Getter
 	private String chestVoteRewardName = "VoteReward";
 
-	@ConfigDataBoolean(path = "CHEST.VoteShopBackButton")
-	@Getter
-	private boolean chestVoteShopBackButton = true;
-
-	@ConfigDataBoolean(path = "CHEST.VoteShopReopenGUIOnPurchase")
-	@Getter
-	private boolean chestVoteShopReopenGUIOnPurchase = true;
-
-	public boolean getChestVoteShopCloseGUI(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".CloseGUI", true);
-	}
-	
-	public boolean getChestVoteShopHideOnNoPermission(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".HideOnNoPermission", true);
-	}
-
-	@ConfigDataBoolean(path = "CHEST.VoteShopEnabled")
-	@Getter
-	private boolean chestVoteShopEnabled = true;
-
-	@ConfigDataString(path = "CHEST.VoteShopName")
-	@Getter
-	private String chestVoteShopName = "VoteShop";
-
-	public boolean getChestVoteShopNotBuyable(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".NotBuyable", false);
-	}
-
-	public String getChestVoteShopPermission(String ident) {
-		return getData().getString("CHEST.Shop." + ident + ".Permission", "");
-	}
-
-	public String getCHESTVoteShopPurchase(String identifier) {
-		return getData().getString("CHEST.Shop." + identifier + ".PurchaseMessage",
-				plugin.getConfigFile().getFormatShopPurchaseMsg());
-	}
-
-	public boolean getChestVoteShopResetDaily(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".Reset.Daily", false);
-	}
-
-	public boolean getChestVoteShopResetMonthly(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".Reset.Monthly", false);
-	}
-
-	public boolean getChestVoteShopResetWeekly(String shop) {
-		return getData().getBoolean("CHEST.Shop." + shop + ".Reset.Weekly", false);
-	}
-
 	@ConfigDataBoolean(path = "CHEST.VoteStreak.BackButton")
 	@Getter
 	private boolean chestVoteStreakBackButton = false;
@@ -523,18 +406,6 @@ public class GUI extends YMLFile {
 		return new HashSet<String>();
 	}
 
-	public ConfigurationSection getChestGUIVoteShopExtraItems(String item) {
-		return getData().getConfigurationSection("CHEST.VoteShopExtraItems." + item);
-	}
-
-	@ConfigDataKeys(path = "CHEST.VoteShopExtraItems")
-	@Getter
-	private Set<String> chestGUIVoteShopExtraItems = new HashSet<String>();
-
-	public ConfigurationSection getChestGUIExtraItemsItem(String gui, String item) {
-		return getData().getConfigurationSection("CHEST." + gui + ".ExtraItems." + item);
-	}
-
 	@ConfigDataString(path = "CHEST.VoteURL.SiteName")
 	@Getter
 	private String chestVoteURLGUISiteName = "&c%Name%";
@@ -567,11 +438,6 @@ public class GUI extends YMLFile {
 	@Getter
 	private boolean chestVoteURLViewAllUrlsButtonEnabled = false;
 
-	public boolean isChestVoteShopRequireConfirmation(String identifier) {
-		return getData().getBoolean("CHEST.Shop." + identifier + ".RequireConfirmation",
-				isChestVoteShopRequireConfirmation());
-	}
-
 	@Override
 	public void loadValues() {
 		new AnnotationHandler().load(getData(), this);
@@ -581,9 +447,4 @@ public class GUI extends YMLFile {
 	public void onFileCreation() {
 		plugin.saveResource("GUI.yml", true);
 	}
-
-	public void removeShop(String value) {
-		getData().set("CHEST.Shop." + value, null);
-		saveData();
-	}
 }

VotingPlugin/src/com/bencodez/votingplugin/config/ShopFile.java

@@ -0,0 +1,198 @@
+package com.bencodez.votingplugin.config;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+import com.bencodez.advancedcore.api.yml.YMLFile;
+import com.bencodez.simpleapi.file.annotation.AnnotationHandler;
+import com.bencodez.simpleapi.file.annotation.ConfigDataBoolean;
+import com.bencodez.simpleapi.file.annotation.ConfigDataConfigurationSection;
+import com.bencodez.simpleapi.file.annotation.ConfigDataKeys;
+import com.bencodez.simpleapi.file.annotation.ConfigDataString;
+import com.bencodez.votingplugin.VotingPluginMain;
+
+import lombok.Getter;
+
+public class ShopFile extends YMLFile {
+
+	@Getter
+	@ConfigDataConfigurationSection(path = "ShopConfirmPurchase.NoItem")
+	private ConfigurationSection shopConfirmPurchaseNoItem;
+
+	@Getter
+	@ConfigDataString(path = "ShopConfirmPurchase.Title")
+	private String shopConfirmPurchaseTitle = "Confirm Purchase?";
+
+	@Getter
+	@ConfigDataConfigurationSection(path = "ShopConfirmPurchase.YesItem")
+	private ConfigurationSection shopConfirmPurchaseYesItem;
+
+	@Getter
+	@ConfigDataString(path = "VoteShop.Disabled")
+	private String voteShopDisabled = "&cVote shop disabled";
+
+	@ConfigDataBoolean(path = "VoteShop.HideLimitedReached")
+	@Getter
+	private boolean voteShopHideLimitedReached = true;
+
+	@ConfigDataString(path = "VoteShop.LimitReached")
+	@Getter
+	private String voteShopLimitReached = "&aYou reached your limit";
+
+	@ConfigDataBoolean(path = "VoteShop.RequireConfirmation")
+	@Getter
+	private boolean voteShopRequireConfirmation = false;
+
+	private VotingPluginMain plugin;
+
+	public ShopFile(VotingPluginMain plugin) {
+		super(plugin, new File(plugin.getDataFolder(), "Shop.yml"));
+		this.plugin = plugin;
+	}
+
+	public void createShop(String value) {
+		ConfigurationSection shopData = getData().createSection("Shop." + value);
+		shopData.set("Identifier_Name", value);
+		shopData.set("Material", "STONE");
+		shopData.set("Amount", 1);
+		shopData.set("Name", "&cPlaceholder item");
+		shopData.set("Cost", 1);
+		shopData.set("Permission", "");
+		shopData.set("CloseGUI", true);
+		shopData.set("RequireConfirmation", false);
+
+		shopData.set("Rewards.Items.Item1.Material", "STONE");
+		shopData.set("Rewards.Items.Item1.Amount", 1);
+		saveData();
+	}
+
+	public int getShopIdentifierCost(String identifier) {
+		return getData().getInt("Shop." + identifier + ".Cost");
+	}
+
+	public String getShopIdentifierIdentifierName(String identifier) {
+		return getData().getString("Shop." + identifier + ".Identifier_Name", identifier);
+	}
+
+	public int getShopIdentifierLimit(String identifier) {
+		return getData().getInt("Shop." + identifier + ".Limit", -1);
+	}
+
+	public String getShopIdentifierRewardsPath(String identifier) {
+		return "Shop." + identifier + ".Rewards";
+	}
+
+	public Set<String> getShopIdentifiers() {
+		ConfigurationSection shop = getData().getConfigurationSection("Shop");
+		if (shop != null) {
+			return shop.getKeys(false);
+		}
+		return new HashSet<String>();
+	}
+
+	public ConfigurationSection getShopIdentifierSection(String identifier) {
+		return getData().getConfigurationSection("Shop." + identifier);
+	}
+
+	@ConfigDataBoolean(path = "VoteShop.BackButton")
+	@Getter
+	private boolean voteShopBackButton = true;
+
+	@ConfigDataBoolean(path = "VoteShop.ReopenGUIOnPurchase")
+	@Getter
+	private boolean voteShopReopenGUIOnPurchase = true;
+
+	public boolean getVoteShopCloseGUI(String shop) {
+		return getData().getBoolean("Shop." + shop + ".CloseGUI", true);
+	}
+
+	public boolean getVoteShopHideOnNoPermission(String shop) {
+		return getData().getBoolean("Shop." + shop + ".HideOnNoPermission", true);
+	}
+
+	@ConfigDataBoolean(path = "VoteShop.Enabled")
+	@Getter
+	private boolean voteShopEnabled = true;
+
+	@ConfigDataString(path = "VoteShop.Name")
+	@Getter
+	private String voteShopName = "VoteShop";
+
+	public boolean getVoteShopNotBuyable(String shop) {
+		return getData().getBoolean("Shop." + shop + ".NotBuyable", false);
+	}
+
+	public String getVoteShopPermission(String ident) {
+		return getData().getString("Shop." + ident + ".Permission", "");
+	}
+
+	public String getVoteShopPurchase(String identifier) {
+		return getData().getString("Shop." + identifier + ".PurchaseMessage",
+				plugin.getConfigFile().getFormatShopPurchaseMsg());
+	}
+
+	public boolean getVoteShopResetDaily(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Daily", false);
+	}
+
+	public boolean getVoteShopResetMonthly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Monthly", false);
+	}
+
+	public boolean getVoteShopResetWeekly(String shop) {
+		return getData().getBoolean("Shop." + shop + ".Reset.Weekly", false);
+	}
+
+	public ConfigurationSection getGUIVoteShopExtraItems(String item) {
+		return getData().getConfigurationSection("ExtraItems." + item);
+	}
+
+	@ConfigDataKeys(path = "ExtraItems")
+	@Getter
+	private Set<String> voteShopExtraItems = new HashSet<String>();
+
+	public boolean isVoteShopRequireConfirmation(String identifier) {
+		return getData().getBoolean("Shop." + identifier + ".RequireConfirmation", isVoteShopRequireConfirmation());
+	}
+
+	@Override
+	public void loadValues() {
+		new AnnotationHandler().load(getData(), this);
+	}
+
+	@Override
+	public void onFileCreation() {
+		plugin.saveResource("Shop.yml", true);
+	}
+
+	public void convertFromGUIFile() {
+		// booleans
+		setValue("VoteShop.Enabled", plugin.getGui().getData().getBoolean("CHEST.VoteShopEnabled"));
+		setValue("VoteShop.BackButton", plugin.getGui().getData().getBoolean("CHEST.VoteShopBackButton"));
+		setValue("VoteShop.HideLimitReached", plugin.getGui().getData().getBoolean("CHEST.VoteShopHideLimitedReached"));
+		setValue("VoteShop.RequireConfirmation",
+				plugin.getGui().getData().getBoolean("CHEST.VoteShopRequireConfirmation"));
+		setValue("VoteShop.ReopenGUIOnPurchase",
+				plugin.getGui().getData().getBoolean("CHEST.VoteShopReopenGUIOnPurchase"));
+
+		// strings
+		setValue("VoteShop.Name", plugin.getGui().getData().getString("CHEST.VoteShopName"));
+		setValue("VoteShop.LimitReached", plugin.getGui().getData().getString("CHEST.VoteShopLimitReached"));
+		setValue("VoteShop.Disabled", plugin.getGui().getData().getString("CHEST.VoteShopDisabled"));
+
+		// sections
+		setValue("Shop", plugin.getGui().getData().getConfigurationSection("CHEST.Shop"));
+		setValue("ExtraItems", plugin.getGui().getData().getConfigurationSection("CHEST.VoteShopExtraItems"));
+		setValue("ShopConfirmPurchase", plugin.getGui().getData().getConfigurationSection("CHEST.ShopConfirmPurchase"));
+		saveData();
+
+	}
+
+	public void removeShop(String value) {
+		getData().set("Shop." + value, null);
+		saveData();
+	}
+}

VotingPlugin/src/com/bencodez/votingplugin/config/SpecialRewardsConfig.java

@@ -66,7 +66,7 @@ public class SpecialRewardsConfig extends YMLFile {
 	@ConfigDataBoolean(path = "VoteParty.ResetExtraVotesMonthly")
 	@Getter
 	private boolean votePartyResetExtraVotesMonthly = false;
-	
+
 	@ConfigDataBoolean(path = "VoteParty.ResetExtraVotesWeekly")
 	@Getter
 	private boolean votePartyResetExtraVotesWeekly = false;
@@ -232,10 +232,23 @@ public class SpecialRewardsConfig extends YMLFile {
 	@Getter
 	private boolean votePartyGiveAllPlayers = false;
 
+	@Deprecated
 	@ConfigDataInt(path = "VoteParty.IncreaseVotesRquired")
 	@Getter
+	private int votePartyIncreaseVotesRquired = 0;
+
+	@ConfigDataInt(path = "VoteParty.IncreaseVotesRequired")
+	@Getter
 	private int votePartyIncreaseVotesRequired = 0;
 
+	public int getVotePartyIncreaseVotesRequiredWithTypo() {
+		int increase = getVotePartyIncreaseVotesRequired();
+		if (increase > 0) {
+			return increase;
+		}
+		return getVotePartyIncreaseVotesRquired();
+	}
+
 	@ConfigDataBoolean(path = "VoteParty.OnlyOncePerDay")
 	@Getter
 	private boolean votePartyOnlyOncePerDay = false;

VotingPlugin/src/com/bencodez/votingplugin/data/ServerData.java

@@ -38,6 +38,15 @@ public class ServerData {
 		}
 	}
 
+	public void setShopConverted(boolean value) {
+		getData().set("VoteShopConverted", value);
+		saveData();
+	}
+
+	public boolean isVoteShopConverted() {
+		return getData().getBoolean("VoteShopConverted");
+	}
+
 	public void updatePlaceholders() {
 		boolean data = getData().getBoolean("AutoCacheUpdated", false);
 		if (!data) {

VotingPlugin/src/com/bencodez/votingplugin/listeners/PlayerJoinEvent.java

@@ -42,6 +42,8 @@ public class PlayerJoinEvent implements Listener {
 		if (data) {
 			// give offline vote (if they voted offline)
 			user.offVote();
+		} else {
+			plugin.debug("No data detected for " + player.getUniqueId().toString() + "/" + player.getName());
 		}
 
 		user.loginRewards();

VotingPlugin/src/com/bencodez/votingplugin/listeners/PlayerVoteListener.java

@@ -134,6 +134,9 @@ public class PlayerVoteListener implements Listener {
 
 		user.updateName(true);
 
+		// vote party
+		plugin.getVoteParty().vote(user, event.isRealVote(), event.isForceBungee());
+
 		if (event.isBroadcast() && !plugin.getBungeeSettings().isDisableBroadcast()) {
 			// broadcast vote if enabled in config
 			if (plugin.getConfigFile().isBroadcastVotesEnabled()
@@ -223,14 +226,14 @@ public class PlayerVoteListener implements Listener {
 			}
 			LocalDateTime cTime = plugin.getTimeChecker().getTime();
 			int days = cTime.getDayOfMonth();
+			plugin.extraDebug("Current day of month: " + days + " Current total: " + value);
 			if (value >= days * plugin.getVoteSitesEnabled().size()) {
+				plugin.debug("Detected higher month total, changing. Current Total: " + value + " Days: " + days
+						+ " New Total: " + days * plugin.getVoteSitesEnabled().size());
 				user.setTotal(TopVoter.Monthly, days * plugin.getVoteSitesEnabled().size());
 			}
 		}
 
-		// vote party
-		plugin.getVoteParty().vote(user, event.isRealVote(), event.isForceBungee());
-
 		// other rewards
 		plugin.getSpecialRewards().checkAllSites(user, event.isForceBungee());
 		plugin.getSpecialRewards().checkAlmostAllSites(user, event.isForceBungee());

VotingPlugin/src/com/bencodez/votingplugin/objects/VoteSite.java

@@ -202,15 +202,16 @@ public class VoteSite {
 	}
 
 	public void giveRewards(VotingPluginUser user, boolean online, boolean bungee) {
+		new RewardBuilder(plugin.getConfigVoteSites().getData(), plugin.getConfigVoteSites().getEverySiteRewardPath())
+				.setOnline(online).withPlaceHolder("ServiceSite", getServiceSite())
+				.withPlaceHolder("SiteName", getDisplayName()).withPlaceHolder("VoteDelay", "" + getVoteDelay())
+				.withPlaceHolder("VoteURL", getVoteURL()).setServer(bungee).send(user);
+
 		new RewardBuilder(plugin.getConfigVoteSites().getData(), plugin.getConfigVoteSites().getRewardsPath(key))
 				.setOnline(online).withPlaceHolder("ServiceSite", getServiceSite())
 				.withPlaceHolder("SiteName", getDisplayName()).withPlaceHolder("VoteDelay", "" + getVoteDelay())
 				.withPlaceHolder("VoteURL", getVoteURL()).setServer(bungee).send(user);
 
-		new RewardBuilder(plugin.getConfigVoteSites().getData(), plugin.getConfigVoteSites().getEverySiteRewardPath())
-				.setOnline(online).withPlaceHolder("ServiceSite", getServiceSite())
-				.withPlaceHolder("SiteName", getDisplayName()).withPlaceHolder("VoteDelay", "" + getVoteDelay())
-				.withPlaceHolder("VoteURL", getVoteURL()).setServer(bungee).send(user);
 	}
 
 	public boolean hasRewards() {

VotingPlugin/src/com/bencodez/votingplugin/placeholders/PlaceHolders.java

@@ -352,8 +352,8 @@ public class PlaceHolders {
 			}
 		}.withDescription("Get number of votes until next available milestone").updateDataKey("MilestoneCount"));
 
-		for (final String identifier : plugin.getGui().getChestShopIdentifiers()) {
-			if (plugin.getGui().getChestShopIdentifierLimit(identifier) > 0) {
+		for (final String identifier : plugin.getShopFile().getShopIdentifiers()) {
+			if (plugin.getShopFile().getShopIdentifierLimit(identifier) > 0) {
 				placeholders.add(new PlaceHolder<VotingPluginUser>("VoteShopLimit_" + identifier) {
 
 					@Override
@@ -573,6 +573,9 @@ public class PlaceHolders {
 
 			@Override
 			public String placeholderRequest(VotingPluginUser user, String identifier) {
+				if (!MessageAPI.isInt(identifier.split("_")[1])) {
+					return "invalid";
+				}
 				int number = Integer.parseInt(identifier.split("_")[1]);
 				if (user.getPoints() >= number) {
 					return "true";
@@ -602,7 +605,7 @@ public class PlaceHolders {
 			@Override
 			public String placeholderRequest(String identifier) {
 				if (!MessageAPI.isInt(identifier.split("_")[2])) {
-					return null;
+					return "invalid";
 				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
@@ -653,7 +656,7 @@ public class PlaceHolders {
 				@Override
 				public String placeholderRequest(String identifier) {
 					if (!MessageAPI.isInt(identifier.split("_")[2])) {
-						return null;
+						return "invalid";
 					}
 					int num = 1;
 					int number = Integer.parseInt(identifier.split("_")[2]);
@@ -690,7 +693,7 @@ public class PlaceHolders {
 			@Override
 			public String placeholderRequest(String identifier) {
 				if (!MessageAPI.isInt(identifier.split("_")[2])) {
-					return null;
+					return "invalid";
 				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
@@ -741,7 +744,7 @@ public class PlaceHolders {
 			@Override
 			public String placeholderRequest(String identifier) {
 				if (!MessageAPI.isInt(identifier.split("_")[2])) {
-					return null;
+					return "invalid";
 				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
@@ -792,7 +795,7 @@ public class PlaceHolders {
 			@Override
 			public String placeholderRequest(String identifier) {
 				if (!MessageAPI.isInt(identifier.split("_")[2])) {
-					return null;
+					return "invalid";
 				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);

VotingPlugin/src/com/bencodez/votingplugin/topvoter/TopVoterHandler.java

@@ -13,6 +13,8 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.UUID;
 
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -198,8 +200,8 @@ public class TopVoterHandler implements Listener {
 				e.printStackTrace();
 			}
 
-			for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
-				if (plugin.getGui().getChestVoteShopResetDaily(shopIdent)) {
+			for (String shopIdent : plugin.getShopFile().getShopIdentifiers()) {
+				if (plugin.getShopFile().getVoteShopResetDaily(shopIdent)) {
 					resetVoteShopLimit(shopIdent);
 				}
 			}
@@ -315,8 +317,8 @@ public class TopVoterHandler implements Listener {
 				resetGottenMilestones();
 			}
 
-			for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
-				if (plugin.getGui().getChestVoteShopResetMonthly(shopIdent)) {
+			for (String shopIdent : plugin.getShopFile().getShopIdentifiers()) {
+				if (plugin.getShopFile().getVoteShopResetMonthly(shopIdent)) {
 					resetVoteShopLimit(shopIdent);
 				}
 			}
@@ -344,6 +346,12 @@ public class TopVoterHandler implements Listener {
 
 	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
 	public void onPreDateChanged(PreDateChangedEvent event) {
+		if (event.getTimeType().equals(TimeType.DAY)) {
+			plugin.getBannedPlayers().clear();
+			for (OfflinePlayer p : Bukkit.getBannedPlayers()) {
+				plugin.getBannedPlayers().add(p.getUniqueId().toString());
+			}
+		}
 		plugin.setUpdate(true);
 		plugin.update();
 	}
@@ -425,8 +433,8 @@ public class TopVoterHandler implements Listener {
 				e.printStackTrace();
 			}
 
-			for (String shopIdent : plugin.getGui().getChestShopIdentifiers()) {
-				if (plugin.getGui().getChestVoteShopResetWeekly(shopIdent)) {
+			for (String shopIdent : plugin.getShopFile().getShopIdentifiers()) {
+				if (plugin.getShopFile().getVoteShopResetWeekly(shopIdent)) {
 					resetVoteShopLimit(shopIdent);
 				}
 			}

VotingPlugin/src/com/bencodez/votingplugin/topvoter/TopVoterPlayer.java

@@ -29,8 +29,8 @@ public class TopVoterPlayer {
 		this.lastVoteTime = lastVoteTime;
 	}
 
-	public ItemStack getPlayerHead() {
-		return PlayerManager.getInstance().getPlayerSkull(getPlayerName(), false);
+	public ItemStack getPlayerHead(boolean force) {
+		return PlayerManager.getInstance().getPlayerSkull(getPlayerName(), force);
 	}
 
 	public VotingPluginUser getUser() {

VotingPlugin/src/com/bencodez/votingplugin/user/VotingPluginUser.java

@@ -110,6 +110,11 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 		if (points != 0) {
 			addPoints(points);
 		}
+		if (plugin.getConfigFile().getLimitVotePoints() > 0) {
+			if (getPoints() > plugin.getConfigFile().getLimitVotePoints()) {
+				setPoints(plugin.getConfigFile().getLimitVotePoints());
+			}
+		}
 	}
 
 	/**
@@ -1174,30 +1179,26 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 
 			String info = "";
 			if (diffDays == 1) {
-				info += PlaceholderUtils
-						.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
-								plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
-								plugin.getConfigFile().getFormatTimeFormatsDay()), "amount", "" + diffDays);
+				info += PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
+						plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+						plugin.getConfigFile().getFormatTimeFormatsDay()), "amount", "" + diffDays);
 				info += " ";
 			} else if (diffDays > 1) {
-				info += PlaceholderUtils
-						.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
-								plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
-								plugin.getConfigFile().getFormatTimeFormatsDays()), "amount", "" + diffDays);
+				info += PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
+						plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+						plugin.getConfigFile().getFormatTimeFormatsDays()), "amount", "" + diffDays);
 				info += " ";
 			}
 
 			if (diffHours == 1) {
-				info += PlaceholderUtils
-						.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
-								plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
-								plugin.getConfigFile().getFormatTimeFormatsHour()), "amount", "" + diffHours);
+				info += PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
+						plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+						plugin.getConfigFile().getFormatTimeFormatsHour()), "amount", "" + diffHours);
 				info += " ";
 			} else if (diffHours > 1) {
-				info += PlaceholderUtils
-						.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
-								plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
-								plugin.getConfigFile().getFormatTimeFormatsHours()), "amount", "" + diffHours);
+				info += PlaceholderUtils.replacePlaceHolder(PlaceholderUtils.replacePlaceHolder(
+						plugin.getConfigFile().getFormatCommandsVoteLastTimeFormat(), "TimeType",
+						plugin.getConfigFile().getFormatTimeFormatsHours()), "amount", "" + diffHours);
 				info += " ";
 			}
 
@@ -1225,8 +1226,8 @@ public class VotingPluginUser extends com.bencodez.advancedcore.api.user.Advance
 				}
 			}
 
-			info = PlaceholderUtils
-					.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteLastLastVoted(), "times", info);
+			info = PlaceholderUtils.replacePlaceHolder(plugin.getConfigFile().getFormatCommandsVoteLastLastVoted(),
+					"times", info);
 
 			return info;
 		}

VotingPlugin/src/com/bencodez/votingplugin/voteparty/VoteParty.java

@@ -346,18 +346,20 @@ public class VoteParty implements Listener {
 	}
 
 	public void checkVoteReminder(VotingPluginUser user) {
-		int neededVotes = getNeededVotes();
+		if (!user.isVanished()) {
+			int neededVotes = getNeededVotes();
 
-		for (String str : plugin.getSpecialRewardsConfig().getVotePartyVoteReminderAtVotes()) {
-			if (MessageAPI.isInt(str)) {
-				int num = Integer.parseInt(str);
-				if (neededVotes == num) {
-					String broadcastMessage = plugin.getSpecialRewardsConfig().getVotePartyVoteReminderBroadcast();
-					HashMap<String, String> placeholders = new HashMap<String, String>();
-					placeholders.put("player", user.getPlayerName());
-					placeholders.put("votesrequired", "" + neededVotes);
-					MiscUtils.getInstance()
-							.broadcast(PlaceholderUtils.replacePlaceHolder(broadcastMessage, placeholders));
+			for (String str : plugin.getSpecialRewardsConfig().getVotePartyVoteReminderAtVotes()) {
+				if (MessageAPI.isInt(str)) {
+					int num = Integer.parseInt(str);
+					if (neededVotes == num) {
+						String broadcastMessage = plugin.getSpecialRewardsConfig().getVotePartyVoteReminderBroadcast();
+						HashMap<String, String> placeholders = new HashMap<String, String>();
+						placeholders.put("player", user.getPlayerName());
+						placeholders.put("votesrequired", "" + neededVotes);
+						MiscUtils.getInstance()
+								.broadcast(PlaceholderUtils.replacePlaceHolder(broadcastMessage, placeholders));
+					}
 				}
 			}
 		}