diff --git a/AdvancedCore/pom.xml b/AdvancedCore/pom.xml
index d174002cc4..cd5c07a29b 100644
--- a/AdvancedCore/pom.xml
+++ b/AdvancedCore/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.Ben12345rocks
AdvancedCore
- 2.8.6
+ 2.8.7
jar
AdvancedCore
diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java
index dc77c891ab..ae6f7a52fa 100644
--- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java
+++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/AdvancedCoreHook.java
@@ -82,6 +82,15 @@ public static AdvancedCoreHook getInstance() {
private ArrayList javascriptEngineRequests = new ArrayList();
private String version = "";
private String buildTime = "";
+ private int maxMysqlSize = -1;
+
+ public int getMaxMysqlSize() {
+ return maxMysqlSize;
+ }
+
+ public void setMaxMysqlSize(int maxMysqlSize) {
+ this.maxMysqlSize = maxMysqlSize;
+ }
private HashMap javascriptEngine = new HashMap();
diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Listeners/PlayerJoinEvent.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Listeners/PlayerJoinEvent.java
index 714ed108be..7b76467c30 100644
--- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Listeners/PlayerJoinEvent.java
+++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Listeners/PlayerJoinEvent.java
@@ -43,6 +43,8 @@ public PlayerJoinEvent(Plugin plugin) {
*/
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPlayerLogin(PlayerLoginEvent event) {
+ AdvancedCoreHook.getInstance()
+ .debug("Login: " + event.getPlayer().getName() + " (" + event.getPlayer().getUniqueId() + ")");
Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
@Override
@@ -65,6 +67,8 @@ public void run() {
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onPlayerQuit(PlayerQuitEvent event) {
+ AdvancedCoreHook.getInstance()
+ .debug("Logout: " + event.getPlayer().getName() + " (" + event.getPlayer().getUniqueId() + ")");
final String uuid = event.getPlayer().getPlayer().getUniqueId().toString();
Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java
index 4c2c5be091..afea3ef65b 100644
--- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java
+++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Objects/User.java
@@ -506,6 +506,13 @@ public boolean hasPermission(String perm) {
}
return player.hasPermission(perm);
}
+
+ public void closeInv() {
+ Player player = getPlayer();
+ if (player != null) {
+ player.closeInventory();
+ }
+ }
/**
* Checks if is online.
diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java
index 3117209100..1aaa457c9f 100644
--- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java
+++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Item/ItemBuilder.java
@@ -322,6 +322,14 @@ public ArrayList getLore() {
public String getName() {
return is.getItemMeta().getDisplayName();
}
+
+ public boolean hasCustomDisplayName() {
+ return is.getItemMeta().hasDisplayName();
+ }
+
+ public boolean hasCustomLore() {
+ return is.getItemMeta().hasLore();
+ }
/**
* @return the skull
diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Updater/Updater.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Updater/Updater.java
index a99b45a692..84fbab2ee6 100644
--- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Updater/Updater.java
+++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/Util/Updater/Updater.java
@@ -1,15 +1,15 @@
package com.Ben12345rocks.AdvancedCore.Util.Updater;
import java.io.BufferedReader;
-import java.io.IOException;
import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.ProtocolException;
import java.net.URL;
+import javax.net.ssl.HttpsURLConnection;
+
import org.bukkit.plugin.java.JavaPlugin;
+import com.Ben12345rocks.AdvancedCore.AdvancedCoreHook;
+
// TODO: Auto-generated Javadoc
/**
* The Class Updater.
@@ -40,14 +40,12 @@ public enum UpdateResult {
UPDATE_AVAILABLE
}
- /** The api key. */
- private final String API_KEY = "98BE0FE67F88AB82B4C197FAF1DC3B69206EFDCC4D3B80FC83A00037510B99B4";
+ // private final String API_KEY =
+ // "98BE0FE67F88AB82B4C197FAF1DC3B69206EFDCC4D3B80FC83A00037510B99B4";
- /** The connection. */
- private HttpURLConnection connection;
+ // private HttpURLConnection connection;
- /** The host. */
- private final String HOST = "http://www.spigotmc.org";
+ // private final String HOST = "http://www.spigotmc.org";
/** The old version. */
private String oldVersion;
@@ -55,11 +53,9 @@ public enum UpdateResult {
/** The plugin. */
private JavaPlugin plugin;
- /** The query. */
- private final String QUERY = "/api/general.php";
+ // private final String QUERY = "/api/general.php";
- /** The request method. */
- private final String REQUEST_METHOD = "POST";
+ // private final String REQUEST_METHOD = "POST";
/** The resource id. */
private String RESOURCE_ID = "";
@@ -70,8 +66,7 @@ public enum UpdateResult {
/** The version. */
private String version;
- /** The write string. */
- private String WRITE_STRING;
+ // private String WRITE_STRING;
/**
* Instantiates a new updater.
@@ -93,14 +88,7 @@ public Updater(JavaPlugin plugin, Integer resourceId, boolean disabled) {
return;
}
- try {
- connection = (HttpURLConnection) new URL(HOST + QUERY).openConnection();
- } catch (IOException e) {
- result = UpdateResult.FAIL_SPIGOT;
- return;
- }
-
- WRITE_STRING = "key=" + API_KEY + "&resource=" + RESOURCE_ID;
+ // WRITE_STRING = "key=" + API_KEY + "&resource=" + RESOURCE_ID;
run();
}
@@ -122,41 +110,39 @@ public String getVersion() {
return version;
}
- /**
- * Run.
- */
private void run() {
- connection.setDoOutput(true);
try {
- connection.setRequestMethod(REQUEST_METHOD);
- connection.getOutputStream().write(WRITE_STRING.getBytes("UTF-8"));
- } catch (ProtocolException e1) {
- result = UpdateResult.FAIL_SPIGOT;
- } catch (UnsupportedEncodingException e) {
- result = UpdateResult.FAIL_SPIGOT;
- } catch (IOException e) {
- result = UpdateResult.FAIL_SPIGOT;
- }
- String version;
- try {
- version = new BufferedReader(new InputStreamReader(connection.getInputStream())).readLine();
- if (version == null) {
- result = UpdateResult.FAIL_SPIGOT;
- return;
- }
- } catch (Exception e) {
- result = UpdateResult.BAD_RESOURCEID;
- return;
- }
- if (version.length() <= 7) {
- this.version = version;
- version.replace("[^A-Za-z]", "").replace("|", "");
+ HttpsURLConnection connection = (HttpsURLConnection) new URL(
+ "https://api.spigotmc.org/legacy/update.php?resource=" + RESOURCE_ID).openConnection();
+ int timed_out = 1250; // check if API is avaible, set your time as you want
+ connection.setConnectTimeout(timed_out);
+ connection.setReadTimeout(timed_out);
+ this.version = new BufferedReader(new InputStreamReader(connection.getInputStream())).readLine();
+ connection.disconnect();
versionCheck();
return;
+ } catch (Exception e) {
+ result = UpdateResult.FAIL_SPIGOT;
+ AdvancedCoreHook.getInstance().debug(e);
}
- result = UpdateResult.BAD_RESOURCEID;
+ result = UpdateResult.FAIL_SPIGOT;
}
+ /*
+ * private void run() { connection.setDoOutput(true); try {
+ * connection.setRequestMethod(REQUEST_METHOD);
+ * connection.getOutputStream().write(WRITE_STRING.getBytes("UTF-8")); } catch
+ * (ProtocolException e1) { result = UpdateResult.FAIL_SPIGOT; } catch
+ * (UnsupportedEncodingException e) { result = UpdateResult.FAIL_SPIGOT; } catch
+ * (IOException e) { result = UpdateResult.FAIL_SPIGOT; } String version; try {
+ * version = new BufferedReader(new
+ * InputStreamReader(connection.getInputStream())).readLine(); if (version ==
+ * null) { result = UpdateResult.FAIL_SPIGOT; return; } } catch (Exception e) {
+ * result = UpdateResult.BAD_RESOURCEID; return; } if (version.length() <= 7) {
+ * this.version = version; version.replace("[^A-Za-z]", "").replace("|", "");
+ * versionCheck(); return; } result = UpdateResult.BAD_RESOURCEID; }
+ */
+
/**
* Should update.
*
diff --git a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/MySQL.java b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/MySQL.java
index f76b75bb2a..56428a90eb 100644
--- a/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/MySQL.java
+++ b/AdvancedCore/src/com/Ben12345rocks/AdvancedCore/mysql/MySQL.java
@@ -41,6 +41,16 @@ public ArrayList load(String key) {
public MySQL(String tableName, String hostName, int port, String database, String user, String pass,
int maxThreads) {
+ if (AdvancedCoreHook.getInstance().getMaxMysqlSize() >= 0) {
+ table = CompatibleCacheBuilder.newBuilder().concurrencyLevel(4).expireAfterAccess(20, TimeUnit.MINUTES)
+ .maximumSize(AdvancedCoreHook.getInstance().getMaxMysqlSize())
+ .build(new CacheLoader>() {
+ @Override
+ public ArrayList load(String key) {
+ return getExactQuery(new Column("uuid", key, DataType.STRING));
+ }
+ });
+ }
name = tableName;
mysql = new com.Ben12345rocks.AdvancedCore.mysql.api.MySQL(maxThreads);
if (!mysql.connect(hostName, "" + port, user, pass, database)) {