Merge pull request #352 from Ben12345rocks/5.12.5

5.12.5

Author: BenCodez

VotingPlugin/Resources/Config.yml

@@ -115,6 +115,7 @@ Format:
   HelpLine: '&3&l%Command% - &3%HelpMessage%'
 
   # Broadcast vote message
+  # Set to an empty message to disable
   BroadcastMsg: '&6[&4Broadcast&6] &2Thanks &c%player% &2for voting on %SiteName%'
 
   # Broadcast only when player is online

VotingPlugin/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>VotingPlugin</artifactId>
-	<version>5.12.4</version>
+	<version>5.12.5</version>
 	<packaging>jar</packaging>
 	<name>VotingPlugin</name>
 	<properties>

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Events/VotiferEvent.java

@@ -151,7 +151,14 @@ public void onVotiferEvent(VotifierEvent event) {
 		Vote vote = event.getVote();
 		final String voteSite = vote.getServiceName();
 		final String voteUsername = vote.getUsername().trim();
-		ServerData.getInstance().addServiceSite(voteSite);
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
+			
+			@Override
+			public void run() {
+				ServerData.getInstance().addServiceSite(voteSite);
+			}
+		});
+		
 
 		if (voteUsername.length() == 0) {
 			plugin.getLogger().warning("No name from vote on " + voteSite);

VotingPlugin/src/com/Ben12345rocks/VotingPlugin/Main.java

@@ -29,13 +29,11 @@
 import com.Ben12345rocks.AdvancedCore.Objects.RewardHandler;
 import com.Ben12345rocks.AdvancedCore.Objects.UUID;
 import com.Ben12345rocks.AdvancedCore.Objects.UserStorage;
-import com.Ben12345rocks.AdvancedCore.Thread.Thread;
 import com.Ben12345rocks.AdvancedCore.Util.Javascript.JavascriptPlaceholderRequest;
 import com.Ben12345rocks.AdvancedCore.Util.Logger.Logger;
 import com.Ben12345rocks.AdvancedCore.Util.Metrics.BStatsMetrics;
 import com.Ben12345rocks.AdvancedCore.Util.Metrics.MCStatsMetrics;
 import com.Ben12345rocks.AdvancedCore.Util.Updater.Updater;
-import com.Ben12345rocks.AdvancedCore.mysql.MySQL;
 import com.Ben12345rocks.VotingPlugin.Commands.CommandLoader;
 import com.Ben12345rocks.VotingPlugin.Commands.Commands;
 import com.Ben12345rocks.VotingPlugin.Commands.Executers.CommandAdminVote;
@@ -131,7 +129,7 @@ public void convertDataStorage(UserStorage from, UserStorage to) {
 		}
 		UserStorage cur = AdvancedCoreHook.getInstance().getStorageType();
 		AdvancedCoreHook.getInstance().setStorageType(from);
-		loadMySQL();
+		AdvancedCoreHook.getInstance().reload();
 		HashMap<User, HashMap<String, String>> data = new HashMap<User, HashMap<String, String>>();
 		for (String uuid : UserManager.getInstance().getAllUUIDs()) {
 			try {
@@ -153,7 +151,7 @@ public void convertDataStorage(UserStorage from, UserStorage to) {
 		plugin.getLogger().info("Finished getting data from " + from.toString());
 
 		AdvancedCoreHook.getInstance().setStorageType(to);
-		loadMySQL();
+		AdvancedCoreHook.getInstance().reload();
 
 		for (Entry<User, HashMap<String, String>> entry : data.entrySet()) {
 			try {
@@ -167,6 +165,7 @@ public void convertDataStorage(UserStorage from, UserStorage to) {
 			}
 		}
 		AdvancedCoreHook.getInstance().setStorageType(cur);
+		AdvancedCoreHook.getInstance().reload();
 
 		plugin.getLogger().info("Finished convertting");
 	}
@@ -271,20 +270,6 @@ public boolean hasVoteSite(String site) {
 		return false;
 	}
 
-	private void loadMySQL() {
-		if (AdvancedCoreHook.getInstance().getStorageType().equals(UserStorage.MYSQL)) {
-			Thread.getInstance().run(new Runnable() {
-
-				@Override
-				public void run() {
-					AdvancedCoreHook.getInstance()
-							.setMysql(new MySQL("VotingPlugin_Users", Config.getInstance().getMySql()));
-				}
-			});
-
-		}
-	}
-
 	private void loadTimer() {
 		Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
 
@@ -844,6 +829,7 @@ public void reload() {
 		configVoteSites.reloadData();
 		updateAdvancedCoreHook();
 		plugin.loadVoteSites();
+		AdvancedCoreHook.getInstance().setConfigData(Config.getInstance().getData());
 		AdvancedCoreHook.getInstance().reload();
 		// loadTimer();
 
@@ -948,32 +934,9 @@ public void update() {
 	}
 
 	public void updateAdvancedCoreHook() {
-		AdvancedCoreHook.getInstance().setAutoDownload(Config.getInstance().getAutoDownload());
 		AdvancedCoreHook.getInstance().getJavascriptEngine().put("VotingPlugin", this);
 		AdvancedCoreHook.getInstance().allowDownloadingFromSpigot(15358);
-		AdvancedCoreHook.getInstance().setExtraDebug(Config.getInstance().getExtraDebug());
-		AdvancedCoreHook.getInstance().setStorageType(UserStorage.value(Config.getInstance().getDataStorage()));
-		loadMySQL();
-
-		AdvancedCoreHook.getInstance()
-				.setDisableCheckOnWorldChange(Config.getInstance().getDisableCheckOnWorldChange());
-		AdvancedCoreHook.getInstance().setDebug(Config.getInstance().getDebugEnabled());
-		AdvancedCoreHook.getInstance().setDebugIngame(Config.getInstance().getDebugInfoIngame());
-		AdvancedCoreHook.getInstance().setDefaultRequestMethod(Config.getInstance().getRequestAPIDefaultMethod());
-		AdvancedCoreHook.getInstance().setDisabledRequestMethods(Config.getInstance().getRequestAPIDisabledMethods());
-		AdvancedCoreHook.getInstance().setFormatNoPerms(Config.getInstance().getFormatNoPerms());
-		AdvancedCoreHook.getInstance().setFormatNotNumber(Config.getInstance().getFormatNotNumber());
-		AdvancedCoreHook.getInstance().setHelpLine(Config.getInstance().getFormatHelpLine());
-		AdvancedCoreHook.getInstance().setLogDebugToFile(Config.getInstance().getLogDebugToFile());
-		AdvancedCoreHook.getInstance().setSendScoreboards(Config.getInstance().getSendScoreboards());
-		AdvancedCoreHook.getInstance().setAlternateUUIDLookUp(Config.getInstance().getAlternateUUIDLookup());
-		AdvancedCoreHook.getInstance().setAutoKillInvs(Config.getInstance().getAutoKillInvs());
-		AdvancedCoreHook.getInstance().setPrevPageTxt(Config.getInstance().getFormatPrevPage());
-		AdvancedCoreHook.getInstance().setNextPageTxt(Config.getInstance().getFormatNextPage());
-
-		AdvancedCoreHook.getInstance().setPurgeOldData(Config.getInstance().getPurgeOldData());
-		AdvancedCoreHook.getInstance().setPurgeMinimumDays(Config.getInstance().getPurgeMin());
-		AdvancedCoreHook.getInstance().setCheckNameMojang(Config.getInstance().getCheckNameMojang());
+		AdvancedCoreHook.getInstance().setConfigData(Config.getInstance().getData());
 	}
 
 }