From 065fe05795c868bebcce9cfcb6f3f25f49e6dfdf Mon Sep 17 00:00:00 2001 From: Tahir Akhlaq Date: Wed, 27 Jul 2016 17:23:52 +0100 Subject: [PATCH 1/2] fixed import script, improved db import times, fixed logging and warp command (should be 5000% legit now) - improved import times for gamedata tables (there's prolly other innodb tables too, i didnt check though) - fixed issue where player wouldnt be readded to zone on warping if destination wasnt valid - corrected typo in warp command lua description - added logger for lua cause i forgot to last time --- FFXIVClassic Map Server/CommandProcessor.cs | 2 +- FFXIVClassic Map Server/NLog.config | 1 + FFXIVClassic Map Server/WorldManager.cs | 15 ++++++++++++--- data/scripts/commands/gm/warp.lua | 2 +- sql/gamedata_achievements.sql | 4 ++++ sql/gamedata_actor_appearance.sql | 4 ++++ sql/gamedata_actor_class.sql | 4 ++++ sql/gamedata_items.sql | 4 ++++ sql/gamedata_items_accessory.sql | 4 ++++ sql/gamedata_items_armor.sql | 2 ++ sql/gamedata_items_equipment.sql | 4 ++++ sql/gamedata_items_graphics.sql | 4 ++++ sql/gamedata_items_weapon.sql | 4 ++++ sql/import.sh | 18 +++++++++++------- 14 files changed, 60 insertions(+), 12 deletions(-) diff --git a/FFXIVClassic Map Server/CommandProcessor.cs b/FFXIVClassic Map Server/CommandProcessor.cs index 6cebd662..50985884 100644 --- a/FFXIVClassic Map Server/CommandProcessor.cs +++ b/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")) { diff --git a/FFXIVClassic Map Server/NLog.config b/FFXIVClassic Map Server/NLog.config index cad2eea9..a59613ac 100644 --- a/FFXIVClassic Map Server/NLog.config +++ b/FFXIVClassic Map Server/NLog.config @@ -53,6 +53,7 @@ +