Desenvolvimento

.travis.yml

@@ -1,12 +1,7 @@
 language: java
 
 jdk:
-  - oraclejdk9
-
-addons:
-  apt:
-    packages:
-      - oracle-java9-installer
+  - oraclejdk10
 
 script: ./gradlew build --daemon
 
@@ -17,4 +12,7 @@ before_cache:
 cache:
   directories:
     - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
+    - $HOME/.gradle/wrapper/
+
+notifications:
+  email: false

Commons/build.gradle

@@ -4,7 +4,7 @@ plugins {
     id "eclipse"
 }
 
-version '1.3.0'
+version '1.4'
 
 ext.moduleName = 'com.l2jbr.commons'
 
@@ -19,9 +19,16 @@ sourceSets {
     }
 }
 
+
+
 dependencies {
-    compile 'com.mchange:c3p0:0.9.5.2'
     compile 'org.slf4j:slf4j-api:1.8.0-beta2'
+    compile 'org.springframework.data:spring-data-jdbc:1.0.0.M3'
+    compile 'com.zaxxer:HikariCP:3.2.0'
+
+    runtime ('mysql:mysql-connector-java:8.0.11') {
+        transitive = false
+    }
 }
 
 jar {

Commons/src/main/com.l2jbr.commons/com/l2jbr/commons/Config.java

@@ -37,6 +37,8 @@
  */
 public final class Config {
     protected static final Logger _log = LoggerFactory.getLogger(Config.class.getName());
+
+
     /**
      * Debug/release mode
      */
@@ -102,6 +104,8 @@ public final class Config {
      */
     public static int DATABASE_MAX_CONNECTIONS;
 
+    public static int DATABASE_MAX_IDLE_TIME;
+
     /**
      * Maximum number of players allowed to play simultaneously on server
      */
@@ -1466,19 +1470,6 @@ public static enum L2WalkerAllowed {
      */
     public static int DUMP_INTERVAL_SECONDS = 60;
 
-    /**
-     * Enumeration for type of ID Factory
-     */
-    public static enum IdFactoryType {
-        Compaction,
-        BitSet,
-        Stack
-    }
-
-    /**
-     * ID Factory type
-     */
-    public static IdFactoryType IDFACTORY_TYPE;
     /**
      * Check for bad ID ?
      */
@@ -1908,6 +1899,7 @@ public static void load() {
                 DATABASE_LOGIN = serverSettings.getProperty("Login", "root");
                 DATABASE_PASSWORD = serverSettings.getProperty("Password", "");
                 DATABASE_MAX_CONNECTIONS = Integer.parseInt(serverSettings.getProperty("MaximumDbConnections", "10"));
+                DATABASE_MAX_IDLE_TIME = Integer.parseInt(serverSettings.getProperty("MaximumDbIdleTime", "0"));
 
                 DATAPACK_ROOT = new File(serverSettings.getProperty("DatapackRoot", ".")).getCanonicalFile();
 
@@ -2100,7 +2092,6 @@ public static void load() {
 
                 MAP_TYPE = ObjectMapType.valueOf(idSettings.getProperty("L2Map", "WorldObjectMap"));
                 SET_TYPE = ObjectSetType.valueOf(idSettings.getProperty("L2Set", "WorldObjectSet"));
-                IDFACTORY_TYPE = IdFactoryType.valueOf(idSettings.getProperty("IDFactory", "Compaction"));
                 BAD_ID_CHECKING = Boolean.valueOf(idSettings.getProperty("BadIdChecking", "True"));
             } catch (Exception e) {
                 e.printStackTrace();
@@ -2735,7 +2726,8 @@ public static void load() {
                 DATABASE_LOGIN = serverSettings.getProperty("Login", "root");
                 DATABASE_PASSWORD = serverSettings.getProperty("Password", "");
                 DATABASE_MAX_CONNECTIONS = Integer.parseInt(serverSettings.getProperty("MaximumDbConnections", "10"));
-
+                DATABASE_MAX_IDLE_TIME = Integer.parseInt(serverSettings.getProperty("MaximumDbIdleTime", "0"));
+
                 SHOW_LICENCE = Boolean.parseBoolean(serverSettings.getProperty("ShowLicence", "true"));
                 IP_UPDATE_TIME = Integer.parseInt(serverSettings.getProperty("IpUpdateTime", "15"));
                 FORCE_GGAUTH = Boolean.parseBoolean(serverSettings.getProperty("ForceGGAuth", "false"));

Commons/src/main/com.l2jbr.commons/com/l2jbr/commons/crypt/NewCrypt.java

@@ -77,7 +77,7 @@ public static boolean verifyChecksum(byte[] raw, final int offset, final int siz
 
 			chksum ^= check;
 		}
-		
+
 		check = raw[i] & 0xff;
 		check |= (raw[i + 1] << 8) & 0xff00;
 		check |= (raw[i + 2] << 0x10) & 0xff0000;
@@ -130,7 +130,10 @@ public static void encXORPass(byte[] raw, int key)
 	}
 
 	/**
-	 * Packet is first XOR encoded with <code>key</code> Then, the last 4 bytes are overwritten with the the XOR "key". Thus this assume that there is enough room for the key to fit without overwriting data.
+	 * Packet is first XOR encoded with <code>key</code>
+	 * Then, the last 4 bytes are overwritten with the the XOR "key".
+     * Thus this assume that there is enough room for the key to fit without overwriting data.
+     *
 	 * @param raw The raw bytes to be encrypted
 	 * @param offset The begining of the data to be encrypted
 	 * @param size Length of the data to be encrypted