hmm

.gitignore

@@ -1,3 +1,4 @@
 production/*
 .idea/*
 .idea/
+.idea/workspace.xml

.idea/09Scape.iml

@@ -3,8 +3,6 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/09HDscape-management-server/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/09HDscape-server/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/Server/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/Management-Server/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/Client/src" isTestSource="false" />
@@ -44,15 +42,6 @@
         <jarDirectory url="file://$MODULE_DIR$/Client/lib" recursive="false" />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$MODULE_DIR$/Client/lib/jogamp-all-platforms/jar/atomic/jogl.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library>
         <CLASSES>

.idea/workspace.xml

@@ -120,20 +120,6 @@
       </list>
     </option>
   </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>tutorial</find>
-      <find>login</find>
-      <find>starter</find>
-      <find>setlastlogin</find>
-      <find>HOME</find>
-      <find>home teleport</find>
-      <find>mystical foresig</find>
-    </findStrings>
-    <dirStrings>
-      <dir>C:\Users\Michael\Desktop\rsps_trash\rs2009\Server\src\plugin\interaction\item</dir>
-    </dirStrings>
-  </component>
   <component name="Git.Settings">
     <option name="UPDATE_TYPE" value="REBASE" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -394,6 +380,7 @@
       </map>
     </option>
   </component>
+<<<<<<< HEAD
   <component name="VcsManagerConfiguration">
     <MESSAGE value="cache bs" />
     <option name="LAST_COMMIT_MESSAGE" value="cache bs" />
@@ -470,4 +457,6 @@
       </state>
     </states>
   </component>
+=======
+>>>>>>> 73347127e9ca3b48af329267c6d2afbd6b334553
 </project>

Client/.gitignore

@@ -14,5 +14,4 @@ data/cache/
 *.iml
 *.eml
 *.userlibraries
-*.class
 data/players/**

CompiledServer/production/09Scape/.gitignore

@@ -7,11 +7,9 @@ data/profile/**
 .DS_Store**
 .project**
 .classpath**
-.class**
 /bin/
 /out/
 *.iml
 *.eml
 *.userlibraries
-*.class
 data/players/**

CompiledServer/production/09Scape/runServer.sh

@@ -1,3 +1,5 @@
 rm -rf org
 cp -r ../CompiledServer/production/09Scape/org .
+rm -rf plugin/
+cp -r ../CompiledServer/production/09Scape/plugin/ .
 java -server -cp ".:./bin;.:./data/libs/*" org.crandor.Server 

Management-Server/.gitignore

@@ -14,6 +14,5 @@ data/cache/
 *.iml
 *.eml
 *.userlibraries
-*.class
 data/players/**
 org/

Management-Server/src/org/keldagrim/ServerConstants.java

@@ -10,6 +10,11 @@ import org.keldagrim.system.OperatingSystem;
  */
 public final class ServerConstants {
 
+	/**
+	 * The port to be used for communications.
+	 */
+	public static final String SERVER_NAME = "RS 2009";
+
 	/**
 	 * The port to be used for communications.
 	 */
@@ -49,12 +54,14 @@ public final class ServerConstants {
 	 * The administrators.
 	 */
 	public static final String[] ADMINISTRATORS = {
-		"ethan",
+			"ethan",
-		"austin",
+			"austin",
+			"redsparr0w",
 	};
 	
 	public static final String[] DATABASE_NAMES = {
-			"keldagr1_server", "keldagr1_global"
+			"server",
+			"global",
 	};
 	
 	/**

Management-Server/src/org/keldagrim/launcher/Constants.java

@@ -24,11 +24,6 @@ public class Constants {
 	 */
 	public static final String CACHE_NAME = File.separator + ".keldagrim_530";
 	
-	/**
-	 * Management Server
-	 */
-	public static final String MANAGEMENT_SERVER = "management.keldagrim.com";
-	
 	/**
 	 * Gets the screen coordinates to place panels in the center
 	 * @param {Dimension} the panel size, null to use default frame size

Management-Server/src/org/keldagrim/net/packet/WorldPacketRepository.java

@@ -3,6 +3,7 @@ package org.keldagrim.net.packet;
 import java.nio.ByteBuffer;
 import java.util.List;
 
+import org.crandor.game.world.GameWorld;
 import org.keldagrim.ServerConstants;
 import org.keldagrim.net.IoSession;
 import org.keldagrim.system.PunishmentStorage;
@@ -14,6 +15,7 @@ import org.keldagrim.world.PlayerSession;
 import org.keldagrim.world.WorldDatabase;
 import org.keldagrim.world.info.Response;
 import org.keldagrim.world.info.UIDInfo;
+import org.keldagrim.world.info.WorldInfo;
 
 /**
  * Repository class for world packets.
@@ -54,6 +56,14 @@ public final class WorldPacketRepository {
 		player.getWorld().getSession().write(buffer);
 	}
 
+	public static void sendPlayerMessage(PlayerSession player, String[] messages) {
+		if (player == null) {
+			return;
+		}
+		for (String message : messages)
+			sendPlayerMessage(player, message);
+	}
+
 	/**
 	 * Sends the contact information.
 	 * @param player The player.
@@ -430,7 +440,7 @@ public final class WorldPacketRepository {
 		}
 		ClanRepository clan = ClanRepository.get(server, clanName);
 		if (clan == null) {
-			sendPlayerMessage(player, "The channel you tried to join does not exist. Try joining the main clan named 'Keldagrim'.:clan:");
+			sendPlayerMessage(player, new String[]{ "The channel you tried to join does not exist.", "Try joining the main clan named '" + ServerConstants.SERVER_NAME + "'.:clan:" });
 			return;
 		}
 		clan.enter(player);

Management-Server/src/org/keldagrim/system/communication/CommunicationInfo.java

@@ -152,7 +152,7 @@ public final class CommunicationInfo {
 		statement.setString(3, contacts);
 		statement.setString(4, blocked);
 		statement.setString(5, clanName);
-		statement.setString(6, currentClan == null ? "grim" : currentClan);
+		statement.setString(6, currentClan);
 		statement.setString(7, joinRequirement.ordinal() + "," + messageRequirement.ordinal() + "," + kickRequirement.ordinal() + "," + lootRequirement.ordinal());
 		statement.setString(8, publicChatSetting + "," + privateChatSetting + "," + tradeSetting);
 	}

Server/.gitignore

@@ -7,11 +7,9 @@ data/profile/**
 .DS_Store**
 .project**
 .classpath**
-.class**
 /bin/
 /out/
 *.iml
 *.eml
 *.userlibraries
-*.class
 data/players/**

Server/runServer.sh

@@ -1,3 +1,5 @@
 rm -rf org
 cp -r ../CompiledServer/production/09Scape/org .
+rm -rf plugin/
+cp -r ../CompiledServer/production/09Scape/plugin/ .
 java -server -cp ".:./bin;.:./data/libs/*" org.crandor.Server 

Server/src/org/crandor/ServerConstants.java

@@ -12,13 +12,6 @@ import org.crandor.tools.mysql.Database;
  */
 public final class ServerConstants {
 	
-	/**
-	 * The administrators.
-	 */
-	public static final String[] ADMINISTRATORS = {
-		"RedSparr0w",
-	};
-	
 	/**
 	 * The cache path.
 	 */
@@ -150,15 +143,16 @@ public final class ServerConstants {
 	/**
 	 * The string of donation messages displayed on an interface.
 	 */
-	public static final String[] MESSAGES = new String[] {"Welcome!" };
+	public static final String[] MESSAGES = new String[] { "Welcome!" };
 	
 	public static final String[] DATABASE_NAMES = {
-			"server", "global"
+			"server",
+			"global",
 	};
-	
+
 	public static final Database[] DATABASES = {
-			new Database((SQLManager.LOCAL ? "localhost" : "redsparr0w.com"), (SQLManager.LOCAL ? "server" : DATABASE_NAMES[0]), (SQLManager.LOCAL ? "root" : "username"), (SQLManager.LOCAL ? "" : "password")),
+			new Database(SQLManager.SQL_SERVER_ADDRESS, DATABASE_NAMES[0], (SQLManager.LOCAL ? "root" : "username"), (SQLManager.LOCAL ? "" : "password")),
-			new Database((SQLManager.LOCAL ? "localhost" : "redsparr0w.com"), (SQLManager.LOCAL ? "global" : DATABASE_NAMES[1]), (SQLManager.LOCAL ? "root" : "username"), (SQLManager.LOCAL ? "" : "password"))
+			new Database(SQLManager.SQL_SERVER_ADDRESS, DATABASE_NAMES[1], (SQLManager.LOCAL ? "root" : "username"), (SQLManager.LOCAL ? "" : "password"))
 	};
 	
 	/**

Server/src/org/crandor/game/system/mysql/SQLManager.java

@@ -21,21 +21,23 @@ public final class SQLManager {
 	 */
 	public static final boolean LOCAL = true;
 
+	public static final String SQL_SERVER_ADDRESS = LOCAL ? "127.0.0.1" : "mywebsite.com";
+
+	/**
+	 * The username of the user.
+	 */
+	private static final String USERNAME = LOCAL ? "root" : "username";
+
+	/**
+	 * The password of the user.
+	 */
+	private static final String PASSWORD = LOCAL ? "" : "password";
+
     /**
      * The database URL.
      */
-    public static final String DATABASE_URL = (LOCAL ? "127.0.0.1" : "keldagrim.org") + ":3306/"+ (LOCAL ? "global" : ServerConstants.DATABASE_NAMES[1]);
+    public static final String DATABASE_URL = SQL_SERVER_ADDRESS + ":3306/" + ServerConstants.DATABASE_NAMES[1];
-    public static final String DATABASE_URL_SERVER = (LOCAL ? "127.0.0.1" : "keldagrim.org") + ":3306/"+ (LOCAL ? "server" : ServerConstants.DATABASE_NAMES[0]);
+    public static final String DATABASE_URL_SERVER = SQL_SERVER_ADDRESS + ":3306/" + ServerConstants.DATABASE_NAMES[0];
-
-    /**
-     * The username of the user.
-     */
-    private static final String USERNAME = (LOCAL ? "root" : "keldagr1_ethan");
-
-    /**
-     * The password of the user.
-     */
-    private static final String PASSWORD = (LOCAL ? "" : "2jf4wkz$");
 
 	/**
 	 * IF the sql manager is initialized.

Server/src/org/crandor/net/amsc/MSPacketRepository.java

@@ -379,8 +379,6 @@ public final class MSPacketRepository {
 		if (buffer.get() == 1) {
 			String name = buffer.getString();
 			sendJoinClan(player, name);
-		} else {
-			sendJoinClan(player, "keldagrim");
 		}
 	}