diff --git a/AdvancedCore/pom.xml b/AdvancedCore/pom.xml
index 43284ef257..1f0e9b91ba 100644
--- a/AdvancedCore/pom.xml
+++ b/AdvancedCore/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.Ben12345rocks
AdvancedCore
- 2.8.4
+ 2.8.5
jar
AdvancedCore
diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java
index 795c1e3451..dc77c891ab 100644
--- 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
index 86fb937576..cadc7360b7 100644
--- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java
+++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/RewardFileData.java
@@ -158,8 +158,11 @@ public ArrayList getChoiceRewardsRewards() {
*/
@SuppressWarnings("unchecked")
public ArrayList getCommandsConsole() {
-
- return (ArrayList) getData().getList("Commands.Console", new ArrayList());
+ if (getData().isList("Commands")) {
+ return (ArrayList) getData().getList("Commands", new ArrayList());
+ } else {
+ return (ArrayList) getData().getList("Commands.Console", new ArrayList());
+ }
}
@@ -300,7 +303,7 @@ public Set getLuckyRewards() {
return new HashSet();
}
}
-
+
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
index 24a7012dd0..4c2c5be091 100644
--- 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 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
index 029b7f7ef5..41180108c6 100644
--- 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);
+
}
}
\ No newline at end of file
diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Misc/MiscUtils.java
index 716deccfc2..f663459915 100644
--- 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 placeholders) {
if (cmds != null && !cmds.isEmpty()) {
placeholders.put("player", playerName);
- final ArrayList commands = ArrayUtils.getInstance().replaceJavascript(Bukkit.getOfflinePlayer(playerName),
+ final ArrayList 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
index 46b250839a..67556ec0e3 100644
--- 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
index 79a1da29a0..1cda3c363c 100644
--- 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);