Merge pull request #78 from Ben12345rocks/2.8.5

2.8.5
BenCodez · Aug 8, 2017 · ef350cb · ef350cb
2 parents 6d66144 + 07281a2
commit ef350cb
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 8 deletions.
diff --git a/AdvancedCore/pom.xml b/AdvancedCore/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.Ben12345rocks</groupId>
 	<artifactId>AdvancedCore</artifactId>
-	<version>2.8.4</version>
+	<version>2.8.5</version>
 	<packaging>jar</packaging>
 	<name>AdvancedCore</name>
 	<properties>

diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java
@@ -89,6 +89,11 @@ public static AdvancedCoreHook getInstance() {
 	private Economy econ = null;
 
 	private Permission perms;
+	private boolean alternateUUIDLookUp;
+
+	public void setAlternateUUIDLookUp(boolean alternateUUIDLookUp) {
+		this.alternateUUIDLookUp = alternateUUIDLookUp;
+	}
 
 	private AdvancedCoreHook() {
 	}
@@ -710,4 +715,8 @@ private boolean setupPermissions() {
 	public void update() {
 		TimeChecker.getInstance().update();
 	}
+
+	public boolean isAlternateUUIDLookUp() {
+		return alternateUUIDLookUp;
+	}
 }
diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java
@@ -158,8 +158,11 @@ public ArrayList<String> getChoiceRewardsRewards() {
 	 */
 	@SuppressWarnings("unchecked")
 	public ArrayList<String> getCommandsConsole() {
-
-		return (ArrayList<String>) getData().getList("Commands.Console", new ArrayList<String>());
+		if (getData().isList("Commands")) {
+			return (ArrayList<String>) getData().getList("Commands", new ArrayList<String>());
+		} else {
+			return (ArrayList<String>) getData().getList("Commands.Console", new ArrayList<String>());
+		}
 
 	}
 
@@ -300,7 +303,7 @@ public Set<String> getLuckyRewards() {
 			return new HashSet<String>();
 		}
 	}
-	
+
 	public boolean getOnlyOneLucky() {
 		return getData().getBoolean("OnlyOneLucky");
 	}

diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java
@@ -18,11 +18,13 @@
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.metadata.MetadataValue;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
 import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+import com.Ben12345rocks.AdvancedCore.UserManager.UserManager;
 import com.Ben12345rocks.AdvancedCore.Util.Effects.ActionBar;
 import com.Ben12345rocks.AdvancedCore.Util.Effects.BossBar;
 import com.Ben12345rocks.AdvancedCore.Util.Effects.Title;
@@ -139,6 +141,17 @@ public User(Plugin plugin, UUID uuid, boolean loadName, boolean loadData) {
 
 	}
 
+	public boolean isVanished() {
+		Player player = getPlayer();
+		if (player != null) {
+			for (MetadataValue meta : player.getMetadata("vanished")) {
+				if (meta.asBoolean())
+					return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * Adds the choice reward.
 	 *
@@ -479,6 +492,10 @@ public boolean hasLoggedOnBefore() {
 			}
 
 		}
+		ArrayList<String> uuids = UserManager.getInstance().getAllUUIDs();
+		if (uuids.contains(getUUID())) {
+			return true;
+		}
 		return false;
 	}
 

diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/TimeChecker/TimeChecker.java
@@ -124,6 +124,9 @@ public void update() {
 	}
 
 	public void forceChanged(TimeType time) {
+		DateChangedEvent dateChanged = new DateChangedEvent(time);
+		plugin.getPlugin().getServer().getPluginManager().callEvent(dateChanged);
+
 		if (time.equals(TimeType.DAY)) {
 			DayChangeEvent dayChange = new DayChangeEvent();
 			plugin.getPlugin().getServer().getPluginManager().callEvent(dayChange);
@@ -135,8 +138,7 @@ public void forceChanged(TimeType time) {
 			plugin.getPlugin().getServer().getPluginManager().callEvent(monthChange);
 		}
 
-		DateChangedEvent dateChanged = new DateChangedEvent(time);
-		plugin.getPlugin().getServer().getPluginManager().callEvent(dateChanged);
+
 
 	}
 }
diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java
@@ -96,7 +96,8 @@ public void executeConsoleCommands(final String playerName, final ArrayList<Stri
 			final HashMap<String, String> placeholders) {
 		if (cmds != null && !cmds.isEmpty()) {
 			placeholders.put("player", playerName);
-			final ArrayList<String> commands = ArrayUtils.getInstance().replaceJavascript(Bukkit.getOfflinePlayer(playerName),
+			final ArrayList<String> commands = ArrayUtils.getInstance().replaceJavascript(
+					Bukkit.getOfflinePlayer(playerName),
 					ArrayUtils.getInstance().replacePlaceHolder(cmds, placeholders));
 			Bukkit.getScheduler().runTask(plugin.getPlugin(), new Runnable() {
 

diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/PlayerUtils.java
@@ -125,12 +125,24 @@ public String getUUID(String playerName) {
 		if (playerName == null) {
 			return null;
 		}
+
+		if (plugin.isAlternateUUIDLookUp()) {
+			for (String uuid : UserManager.getInstance().getAllUUIDs()) {
+				User user = UserManager.getInstance().getUser(new UUID(uuid));
+				String name = user.getData().getString("PlayerName");
+				if (name.equals(playerName)) {
+					return uuid;
+				}
+			}
+		}
+
 		Player player = Bukkit.getPlayer(playerName);
 		if (player == null) {
 			return Bukkit.getOfflinePlayer(playerName).getUniqueId().toString();
 		} else {
 			return player.getUniqueId().toString();
 		}
+
 	}
 
 	/**

diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/ConnectionManager.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/api/ConnectionManager.java
@@ -86,7 +86,7 @@ public boolean open() {
 			config.setDriverClassName("com.mysql.jdbc.Driver");
 			config.setUsername(username);
 			config.setPassword(password);
-			config.setJdbcUrl(String.format("jdbc:mysql://%s:%s/%s", host, port, database));
+			config.setJdbcUrl(String.format("jdbc:mysql://%s:%s/%s", host, port, database) + "?useSSL=false");
 			config.setConnectionTimeout(connectionTimeout);
 			config.setMaximumPoolSize(maximumPoolsize);
 			config.setMinimumIdle(maxConnections);