Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into develop

FFXIVClassic Common Class Lib/Utils.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Text;
 
 namespace FFXIVClassic.Common
@@ -230,5 +231,125 @@ namespace FFXIVClassic.Common
 
             return secondDigit + firstDigit;
         }
+
+
+        public static string FFXIVLoginStringDecodeBinary(string path)
+        {
+            Console.OutputEncoding = System.Text.Encoding.UTF8;
+            byte[] data = File.ReadAllBytes(path);
+            int offset = 0x5405a;
+            //int offset = 0x5425d;
+            //int offset = 0x53ea0;
+            while (true)
+            {
+                string result = "";
+                uint key = (uint)data[offset + 0] << 8 | data[offset + 1];
+                uint key2 = data[offset + 2];
+                key = RotateRight(key, 1) & 0xFFFF;
+                key -= 0x22AF;
+                key &= 0xFFFF;
+                key2 = key2 ^ key;
+                key = RotateRight(key, 1) & 0xFFFF;
+                key -= 0x22AF;
+                key &= 0xFFFF;
+                uint finalKey = key;
+                key = data[offset + 3];
+                uint count = (key2 & 0xFF) << 8;
+                key = key ^ finalKey;
+                key &= 0xFF;
+                count |= key;
+
+                int count2 = 0;
+                while (count != 0)
+                {
+                    uint encrypted = data[offset + 4 + count2];
+                    finalKey = RotateRight(finalKey, 1) & 0xFFFF;
+                    finalKey -= 0x22AF;
+                    finalKey &= 0xFFFF;
+                    encrypted = encrypted ^ (finalKey & 0xFF);
+
+                    result += (char)encrypted;
+                    count--;
+                    count2++;
+                }
+
+                offset += 4 + count2;
+            }
+        }
+
+        public static string FFXIVLoginStringDecode(byte[] data)
+        {
+            string result = "";
+            uint key = (uint)data[0] << 8 | data[1];
+            uint key2 = data[2];
+            key = RotateRight(key, 1) & 0xFFFF;
+            key -= 0x22AF;
+            key2 = key2 ^ key;
+            key = RotateRight(key, 1) & 0xFFFF;
+            key -= 0x22AF;
+            uint finalKey = key;
+            key = data[3];
+            uint count = (key2 & 0xFF) << 8;
+            key = key ^ finalKey;
+            key &= 0xFF;
+            count |= key;
+
+            int count2 = 0;
+            while (count != 0)
+            {
+                uint encrypted = data[4 + count2];
+                finalKey = RotateRight(finalKey, 1) & 0xFFFF;
+                finalKey -= 0x22AF;
+                encrypted = encrypted ^ (finalKey & 0xFF);
+                result += (char)encrypted;
+                count--;
+                count2++;
+            }
+
+            return result;
+        }
+
+        public static byte[] FFXIVLoginStringEncode(uint key, string text)
+        {
+            key = key & 0xFFFF;
+
+            uint count = 0;
+            byte[] asciiBytes = Encoding.ASCII.GetBytes(text);
+            byte[] result = new byte[4 + text.Length];
+            for (count = 0; count < text.Length; count++)
+            {
+                result[result.Length - count - 1] = (byte)(asciiBytes[asciiBytes.Length - count - 1] ^ (key & 0xFF));
+                key += 0x22AF;
+                key &= 0xFFFF;
+                key = RotateLeft(key, 1) & 0xFFFF;
+            }
+
+            count = count ^ key;
+            result[3] = (byte)(count & 0xFF);
+
+            key += 0x22AF & 0xFFFF;
+            key = RotateLeft(key, 1) & 0xFFFF;
+
+            result[2] = (byte)(key & 0xFF);
+
+            key += 0x22AF & 0xFFFF;
+            key = RotateLeft(key, 1) & 0xFFFF;
+
+
+            result[1] = (byte)(key & 0xFF);
+            result[0] = (byte)((key >> 8) & 0xFF);
+
+            return result;
+        }
+
+        public static uint RotateLeft(uint value, int bits)
+        {
+            return (value << bits) | (value >> (16 - bits));
+        }
+
+        public static uint RotateRight(uint value, int bits)
+        {
+            return (value >> bits) | (value << (16 - bits));
+        }
     }
 }

FFXIVClassic Map Server/CommandProcessor.cs

@@ -88,7 +88,7 @@ namespace FFXIVClassic_Map_Server
             if (cmd.Any())
             {
                 // if client isnt null, take player to be the player actor
-                var player = client.GetActor();
+                var player = client?.GetActor();
 
                 if (cmd.Equals("help"))
                 {

FFXIVClassic Map Server/NLog.config

@@ -53,6 +53,7 @@
     <!-- add your logging rules here -->
     <logger name='*' minlevel='Trace' writeTo='file' />
     <logger name='FFXIVClassic_Map_Server.Program' minlevel='Trace' writeTo='console' />
+    <logger name='FFXIVClassic_Map_Server.lua.*' minlevel='Trace' writeTo='console' />
     <logger name='FFXIVClassic_Map_Server.packets.*' minlevel='Debug' writeTo='packets' />
     <!--
     Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"

FFXIVClassic Map Server/WorldManager.cs

@@ -524,12 +524,10 @@ namespace FFXIVClassic_Map_Server
         //Moves actor to new zone, and sends packets to spawn at the given coords.
         public void DoZoneChange(Player player, uint destinationZoneId, string destinationPrivateArea, byte spawnType, float spawnX, float spawnY, float spawnZ, float spawnRotation)
         {
-            Area oldZone;
+            Area oldZone = player.zone;
-
             //Remove player from currentZone if transfer else it's login
             if (player.zone != null)
             {
-                oldZone = player.zone;
                 oldZone.RemoveActorFromZone(player);
             }
 
@@ -540,9 +538,20 @@ namespace FFXIVClassic_Map_Server
                 newArea = GetZone(destinationZoneId);
             else
                 newArea = GetZone(destinationZoneId).GetPrivateArea(destinationPrivateArea, 0);
+
             //This server does not contain that zoneId
             if (newArea == null)
+            {
+                if (oldZone != null)
+                {
+                    oldZone.AddActorToZone(player);
+                }
+
+                var message = "WorldManager.DoZoneChange: unable to change areas, new area is not valid.";
+                player.SendMessage(SendMessagePacket.MESSAGE_TYPE_SYSTEM, "[Debug]", message);
+                Program.Log.Debug(message);
                 return;
+            }
 
             newArea.AddActorToZone(player);
 

data/scripts/commands/gm/warp.lua

@@ -7,7 +7,7 @@ properties = {
 [[
 <zone> |
 <zone> <x> <y> <z> |
-<x> <y> <z> <zone> <privateArea> <target name>.
+<zone> <x> <y> <z> <privateArea> <target name>.
 ]],
 }
 

sql/gamedata_achievements.sql

@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_achievements`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_achievements`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -795,4 +797,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:49

sql/gamedata_actor_appearance.sql

@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_actor_appearance`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_actor_appearance`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -7916,4 +7918,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:50

sql/gamedata_actor_class.sql

@@ -8,6 +8,8 @@ Date: 6/21/2016 10:49:37 PM
 */
 
 SET FOREIGN_KEY_CHECKS=0;
+SET autocommit = 0;
+
 -- ----------------------------
 -- Table structure for gamedata_actor_class
 -- ----------------------------
@@ -8006,3 +8008,5 @@ INSERT INTO `gamedata_actor_class` VALUES ('9220405', '', '2', null);
 INSERT INTO `gamedata_actor_class` VALUES ('9220406', '', '2', null);
 INSERT INTO `gamedata_actor_class` VALUES ('9220407', '', '2', null);
 INSERT INTO `gamedata_actor_class` VALUES ('9220408', '', '2', null);
+
+COMMIT;

sql/gamedata_items.sql

@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_items`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_items`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -8476,4 +8478,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:51

sql/gamedata_items_accessory.sql

@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_items_accessory`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_items_accessory`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -326,4 +328,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:51

sql/gamedata_items_armor.sql

@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_items_armor`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_items_armor`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;

sql/gamedata_items_equipment.sql

@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_items_equipment`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_items_equipment`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -4946,4 +4948,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:52

sql/gamedata_items_graphics.sql

@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_items_graphics`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_items_graphics`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -144,4 +146,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:52

sql/gamedata_items_weapon.sql

@@ -19,6 +19,8 @@
 -- Table structure for table `gamedata_items_weapon`
 --
 
+SET autocommit = 0;
+
 DROP TABLE IF EXISTS `gamedata_items_weapon`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -1230,4 +1232,6 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+COMMIT;
+
 -- Dump completed on 2016-06-07 22:54:52

sql/import.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-IMPORT_PATH=C:/repositories/ffxiv-classic-server/sql/
+IMPORT_PATH="C://coding//repositories//ffxiv related//ffxivclassic//ffxiv-classic-server//sql//"
 USER=root
 PASS=root
 DBNAME=ffxiv_server
@@ -8,14 +8,18 @@ ECHO Creating Database $DBNAME
 mysqladmin -h localhost -u $USER -p$PASS DROP $DBNAME
 
 ECHO Creating Database $DBNAME
-mysqladmin -h localhost -u $USER -p$PASS CREATE $DBNAME
+mysqladmin -h localhost -u $USER -p$PASS CREATE $DBNAME IF NOT EXISTS $DBNAME
 
 ECHO Loading $DBNAME tables into the database
-cd $IMPORT_PATH
+sh cd $IMPORT_PATH
-for X in *.sql;
+
+for X in '*.sql';
 do
-	echo Importing $X;
+	for Y in $X
-	"C:\program files\mysql\mysql server 5.7\bin\mysql" $DBNAME -h localhost -u $USER -p$PASS < $X
+	do
+		echo Importing $Y;
+		"C:\program files\mysql\mysql server 5.7\bin\mysql" $DBNAME -h localhost -u $USER -p$PASS < $Y
+	done
 done
 
 ECHO Finished!