From af4be4b916e951ee3e9fdc67a2c4b8723b7e18b0 Mon Sep 17 00:00:00 2001
From: thispixel <stuart@programmer.net>
Date: Fri, 13 Mar 2015 14:34:51 +0000
Subject: [PATCH] Add graphic height support to npcs

---
 data/net.xml                                  |  2 +-
 pom.xml                                       |  7 ++
 .../NpcSynchronizationMessageEncoder.java     |  4 +-
 .../NpcSynchronizationMessageEncoder.java     |  2 +-
 src/org/apollo/util/DatabaseUtil.java         | 72 +++++++++++++++++++
 5 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 src/org/apollo/util/DatabaseUtil.java

diff --git a/data/net.xml b/data/net.xml
index fe5da2a3..77a5a79f 100644
--- a/data/net.xml
+++ b/data/net.xml
@@ -5,7 +5,7 @@
   </rsa>
 
   <ports>
-    <http>80</http>
+    <http>43596</http>
     <service>43594</service>
     <jaggrab>43595</jaggrab>
   </ports>
diff --git a/pom.xml b/pom.xml
index 1fb4a2a5..6a6543b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,5 +67,12 @@
         <artifactId>scrypt</artifactId>
         <version>1.4.0</version>
     </dependency>
+
+      <dependency>
+          <groupId>com.mchange</groupId>
+          <artifactId>c3p0</artifactId>
+          <version>0.9.5</version>
+      </dependency>
+
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/src/org/apollo/net/release/r317/NpcSynchronizationMessageEncoder.java b/src/org/apollo/net/release/r317/NpcSynchronizationMessageEncoder.java
index 1bd16ca9..c4bd440e 100644
--- a/src/org/apollo/net/release/r317/NpcSynchronizationMessageEncoder.java
+++ b/src/org/apollo/net/release/r317/NpcSynchronizationMessageEncoder.java
@@ -194,8 +194,8 @@ public final class NpcSynchronizationMessageEncoder extends MessageEncoder<NpcSy
 	private static void putGraphicBlock(GraphicBlock block, GamePacketBuilder builder) {
 		Graphic graphic = block.getGraphic();
 		builder.put(DataType.SHORT, graphic.getId());
-		builder.put(DataType.INT, graphic.getDelay());
-	}
+        builder.put(DataType.INT, graphic.getHeight() << 16 | graphic.getDelay() & 0xFFFF);
+    }
 
 	/**
 	 * Puts a hit update block into the specified builder.
diff --git a/src/org/apollo/net/release/r377/NpcSynchronizationMessageEncoder.java b/src/org/apollo/net/release/r377/NpcSynchronizationMessageEncoder.java
index c95abd0e..9625b8c0 100644
--- a/src/org/apollo/net/release/r377/NpcSynchronizationMessageEncoder.java
+++ b/src/org/apollo/net/release/r377/NpcSynchronizationMessageEncoder.java
@@ -194,7 +194,7 @@ public final class NpcSynchronizationMessageEncoder extends MessageEncoder<NpcSy
 	private static void putGraphicBlock(GraphicBlock block, GamePacketBuilder builder) {
 		Graphic graphic = block.getGraphic();
 		builder.put(DataType.SHORT, graphic.getId());
-		builder.put(DataType.INT, DataOrder.MIDDLE, graphic.getDelay());
+        builder.put(DataType.INT, graphic.getHeight() << 16 | graphic.getDelay() & 0xFFFF);
 	}
 
 	/**
diff --git a/src/org/apollo/util/DatabaseUtil.java b/src/org/apollo/util/DatabaseUtil.java
new file mode 100644
index 00000000..c4434a5f
--- /dev/null
+++ b/src/org/apollo/util/DatabaseUtil.java
@@ -0,0 +1,72 @@
+package org.apollo.util;
+
+import com.mchange.v2.c3p0.ComboPooledDataSource;
+import org.apollo.util.xml.XmlNode;
+import org.apollo.util.xml.XmlParser;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ *
+ *
+ * @author Stuart
+ */
+public final class DatabaseUtil {
+
+    /**
+     *
+     */
+    private static final ComboPooledDataSource pool = new ComboPooledDataSource();
+
+    static {
+        try(InputStream is = new FileInputStream("data/database.xml")) {
+            XmlNode config = new XmlParser().parse(is);
+            if(!config.getName().equals("database")) {
+                throw new IOException("Root node is not 'database'.");
+            }
+
+            XmlNode url = config.getChild("url"), username = config.getChild("username"), password = config.getChild("password");
+            if(url == null || username == null || password == null) {
+                throw new IOException("Root node must contain these three children - 'url', 'username', 'password'.");
+            }
+
+            pool.setJdbcUrl(url.getValue());
+            pool.setUser(username.getValue());
+            pool.setPassword(password.getValue());
+
+            // optional params
+            XmlNode initialPoolSize = config.getChild("initial_pool_size"), acquireIncrement = config.getChild("acquire_increment"),
+                    maxPoolSize = config.getChild("max_pool_size"), minPoolSize = config.getChild("min_pool_size");
+
+            if(initialPoolSize != null) {
+                pool.setInitialPoolSize(Integer.parseInt(initialPoolSize.getValue()));
+            }
+            if(acquireIncrement != null) {
+                pool.setAcquireIncrement(Integer.parseInt(acquireIncrement.getValue()));
+            }
+            if(maxPoolSize != null) {
+                pool.setMaxPoolSize(Integer.parseInt(maxPoolSize.getValue()));
+            }
+            if(minPoolSize != null) {
+                pool.setMinPoolSize(Integer.parseInt(minPoolSize.getValue()));
+            }
+        } catch (Exception e) {
+            throw new ExceptionInInitializerError(e);
+        }
+    }
+
+    /**
+     *
+     *
+     * @return
+     * @throws SQLException
+     */
+    public static Connection getConnection() throws SQLException {
+        return pool.getConnection();
+    }
+
+}
\ No newline at end of file