From 1d7ded48299a1331246e8d919a401ef8e81f8c19 Mon Sep 17 00:00:00 2001
From: CodeForFame <CodeForFame@gmail.com>
Date: Mon, 16 May 2011 19:31:12 -0500
Subject: [PATCH] Removed hard-coded client version...

---
 GameServer/src/org/moparscape/msc/config/Config.java           | 2 +-
 .../src/org/moparscape/msc/gs/phandler/client/DummyPacket.java | 3 ++-
 .../src/org/moparscape/msc/gs/phandler/client/PlayerLogin.java | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/GameServer/src/org/moparscape/msc/config/Config.java b/GameServer/src/org/moparscape/msc/config/Config.java
index ecd69ce..79be490 100644
--- a/GameServer/src/org/moparscape/msc/config/Config.java
+++ b/GameServer/src/org/moparscape/msc/config/Config.java
@@ -76,7 +76,7 @@ public class Config {
 		pmods = props.getProperty("pmods").replaceAll(", +", ",").split(",");
 		mods = props.getProperty("mods").replaceAll(", +", ",").split(",");
 		admins = props.getProperty("admins").replaceAll(", +", ",").split(",");
-
+		
 		props.clear();
 		
 		Constants.GameServer.MOTD = "@yel@Welcome to @whi@" + Config.SERVER_NAME + "@yel@ - World @whi@" + (Config.SERVER_NUM == 0 ? 2 : Config.SERVER_NUM) + " (" + (Config.members ? "P2P" : "F2P") + ")";
diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/DummyPacket.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/DummyPacket.java
index 30fa337..534e6c4 100644
--- a/GameServer/src/org/moparscape/msc/gs/phandler/client/DummyPacket.java
+++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/DummyPacket.java
@@ -1,6 +1,7 @@
 package org.moparscape.msc.gs.phandler.client;
 
 import org.apache.mina.common.IoSession;
+import org.moparscape.msc.config.Config;
 import org.moparscape.msc.gs.builders.RSCPacketBuilder;
 import org.moparscape.msc.gs.connection.Packet;
 import org.moparscape.msc.gs.model.Player;
@@ -14,7 +15,7 @@ public class DummyPacket implements PacketHandler {
 	    if (p.getLength() > 2) { // 1 for byte, 2 for short
 		byte b = p.readByte();
 		int clientVersion = p.readShort();
-		if (clientVersion > 34 && clientVersion < 40) {
+		if (clientVersion > Config.SERVER_VERSION - 5 && clientVersion < Config.SERVER_VERSION + 1) {
 		    RSCPacketBuilder pb = new RSCPacketBuilder();
 		    pb.setBare(true);
 		    pb.addByte((byte) 4); // client update
diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogin.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogin.java
index 0d98abe..d9d249a 100644
--- a/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogin.java
+++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/PlayerLogin.java
@@ -62,7 +62,7 @@ public class PlayerLogin implements PacketHandler {
 			}
 			else {
 				player.load(username, password, 0, reconnecting);
-				if (clientVersion < 39) {
+				if (clientVersion < Config.SERVER_VERSION) {
 					player.clientWarn(true);
 				}
 				return;