From 725ca11c6053ff1d663b7118dfb0e156cebd185d Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 28 Jan 2018 11:16:34 +0100
Subject: [PATCH] Revert "Merge pull request #225 from
 GokuWeedLord/event_rewrite"

This reverts commit 4e2319130f4ac70950082543588bc7f7f5742623, reversing
changes made to 695fea7812bad7ad87b626c40b070f0b2ec3ca73.
---
 scripts/native/CMakeLists.txt                 |   7 +-
 .../native/CmnDef/CmnDefCutSceneReplay.cpp    |   2 +-
 scripts/native/CmnDef/CmnDefInnBed.cpp        |   2 +-
 scripts/native/CmnDef/CmnDefLinkShell.cpp     |   2 +-
 scripts/native/CmnDef/HouFurOrchestrion.cpp   |   2 +-
 scripts/native/ScriptLoader.cpp.in            |   4 +-
 scripts/native/action/ActionSprint3.cpp       |   2 +-
 scripts/native/aetheryte/Aethernet.cpp        |   2 +-
 scripts/native/aetheryte/Aetheryte.cpp        |   2 +-
 scripts/native/debugcommands/Add.cpp          | 102 ---
 scripts/native/debugcommands/Get.cpp          |  31 -
 scripts/native/debugcommands/Help.cpp         |  23 -
 .../native/debugcommands/InjectChatPacket.cpp |  21 -
 scripts/native/debugcommands/InjectPacket.cpp |  20 -
 scripts/native/debugcommands/Nudge.cpp        |  56 --
 scripts/native/debugcommands/PreInclude.h     |   7 -
 scripts/native/debugcommands/Replay.cpp       |  29 -
 scripts/native/debugcommands/Script.cpp       |  86 ---
 scripts/native/debugcommands/ServerInfo.cpp   |  17 -
 scripts/native/debugcommands/Set.cpp          | 145 ----
 scripts/native/opening/OpeningGridania.cpp    |   2 +-
 scripts/native/opening/OpeningLimsa.cpp       |   2 +-
 scripts/native/opening/OpeningUldah.cpp       |   2 +-
 scripts/native/quest/ManFst001.cpp            |   2 +-
 scripts/native/quest/ManFst002.cpp            |   2 +-
 scripts/native/quest/ManFst003.cpp            |   2 +-
 scripts/native/quest/ManSea001.cpp            |   2 +-
 scripts/native/quest/ManSea002.cpp            |   2 +-
 scripts/native/quest/ManWil001.cpp            |   2 +-
 scripts/native/quest/ManWil002.cpp            |   2 +-
 .../quest/subquest/gridania/SubFst001.cpp     |   2 +-
 .../quest/subquest/gridania/SubFst002.cpp     |   2 +-
 .../quest/subquest/gridania/SubFst010.cpp     |   2 +-
 .../quest/subquest/gridania/SubFst013.cpp     |   2 +-
 .../sapphire_zone/DebugCommand/DebugCommand.h |  64 ++
 .../DebugCommand/DebugCommandHandler.cpp      | 657 ++++++++++++++++++
 .../DebugCommand/DebugCommandHandler.h        |  52 ++
 .../sapphire_zone/Network/GameConnection.cpp  |   2 +
 .../Network/Handlers/ActionHandler.cpp        |   2 +
 .../Network/Handlers/GMCommandHandlers.cpp    |  13 +-
 .../Network/Handlers/InventoryHandler.cpp     |   2 +
 .../Network/Handlers/PacketHandlers.cpp       |   8 +-
 .../Network/Handlers/SkillHandler.cpp         |   2 +
 .../sapphire_zone/Script/NativeScriptApi.h    |  96 +--
 .../Script/NativeScriptManager.cpp            |  27 -
 .../Script/NativeScriptManager.h              |  15 +-
 .../sapphire_zone/Script/ScriptManager.cpp    |  90 +--
 .../sapphire_zone/Script/ScriptManager.h      |   4 -
 src/servers/sapphire_zone/ServerZone.cpp      |   3 +-
 .../sapphire_zone/Zone/TerritoryMgr.cpp       |   3 +-
 src/servers/sapphire_zone/Zone/Zone.cpp       |  13 -
 src/servers/sapphire_zone/Zone/Zone.h         |   2 -
 52 files changed, 840 insertions(+), 805 deletions(-)
 delete mode 100644 scripts/native/debugcommands/Add.cpp
 delete mode 100644 scripts/native/debugcommands/Get.cpp
 delete mode 100644 scripts/native/debugcommands/Help.cpp
 delete mode 100644 scripts/native/debugcommands/InjectChatPacket.cpp
 delete mode 100644 scripts/native/debugcommands/InjectPacket.cpp
 delete mode 100644 scripts/native/debugcommands/Nudge.cpp
 delete mode 100644 scripts/native/debugcommands/PreInclude.h
 delete mode 100644 scripts/native/debugcommands/Replay.cpp
 delete mode 100644 scripts/native/debugcommands/Script.cpp
 delete mode 100644 scripts/native/debugcommands/ServerInfo.cpp
 delete mode 100644 scripts/native/debugcommands/Set.cpp
 create mode 100644 src/servers/sapphire_zone/DebugCommand/DebugCommand.h
 create mode 100644 src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
 create mode 100644 src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h

diff --git a/scripts/native/CMakeLists.txt b/scripts/native/CMakeLists.txt
index 6107d58f..aeaa0094 100644
--- a/scripts/native/CMakeLists.txt
+++ b/scripts/native/CMakeLists.txt
@@ -39,7 +39,7 @@ foreach(_scriptDir ${children})
         endforeach()
 
         add_library("script_${_name}" MODULE "${SCRIPT_FILES}" "${SCRIPT_INCLUDE_FILES}" "${_scriptDir}/ScriptLoader.cpp")
-        target_link_libraries("script_${_name}" sapphire_zone common xivdat ${Boost_LIBRARIES})
+        target_link_libraries("script_${_name}" sapphire_zone)
 
         if(MSVC)
             set_target_properties("script_${_name}" PROPERTIES
@@ -53,10 +53,6 @@ foreach(_scriptDir ${children})
             )
         endif()
 
-        if(EXISTS "${_scriptDir}/PreInclude.h")
-            set(PreScriptIncludes "#include \"${_scriptDir}/PreInclude.h\"")
-        endif()
-
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ScriptLoader.cpp.in" "${_scriptDir}/ScriptLoader.cpp")
 
         add_custom_command(TARGET "script_${_name}" POST_BUILD
@@ -67,6 +63,5 @@ foreach(_scriptDir ${children})
 
         unset(ScriptIncludes)
         unset(ScriptNames)
-        unset(PreScriptIncludes)
     endif()
 endforeach()
diff --git a/scripts/native/CmnDef/CmnDefCutSceneReplay.cpp b/scripts/native/CmnDef/CmnDefCutSceneReplay.cpp
index 31fde89b..39bf4300 100644
--- a/scripts/native/CmnDef/CmnDefCutSceneReplay.cpp
+++ b/scripts/native/CmnDef/CmnDefCutSceneReplay.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 class CmnDefCutSceneReplay : public EventScript
 {
diff --git a/scripts/native/CmnDef/CmnDefInnBed.cpp b/scripts/native/CmnDef/CmnDefInnBed.cpp
index 36ccd739..ac8a0a68 100644
--- a/scripts/native/CmnDef/CmnDefInnBed.cpp
+++ b/scripts/native/CmnDef/CmnDefInnBed.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 class CmnDefInnBed : public EventScript
 {
diff --git a/scripts/native/CmnDef/CmnDefLinkShell.cpp b/scripts/native/CmnDef/CmnDefLinkShell.cpp
index 16aa593b..f0df71f9 100644
--- a/scripts/native/CmnDef/CmnDefLinkShell.cpp
+++ b/scripts/native/CmnDef/CmnDefLinkShell.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 #define ACTION_CREATE 2
 #define ACTION_RENAME 3
diff --git a/scripts/native/CmnDef/HouFurOrchestrion.cpp b/scripts/native/CmnDef/HouFurOrchestrion.cpp
index 51273ed5..9e47c554 100644
--- a/scripts/native/CmnDef/HouFurOrchestrion.cpp
+++ b/scripts/native/CmnDef/HouFurOrchestrion.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 class HouFurOrchestrion : public EventScript
 {
diff --git a/scripts/native/ScriptLoader.cpp.in b/scripts/native/ScriptLoader.cpp.in
index c5cbc42b..633ca309 100644
--- a/scripts/native/ScriptLoader.cpp.in
+++ b/scripts/native/ScriptLoader.cpp.in
@@ -1,5 +1,7 @@
+#include <vector>
+
 class ScriptObject;
-@PreScriptIncludes@
+
 @ScriptIncludes@
 
 const ScriptObject* ptrs[] =
diff --git a/scripts/native/action/ActionSprint3.cpp b/scripts/native/action/ActionSprint3.cpp
index 82bbfc37..076bbf5f 100644
--- a/scripts/native/action/ActionSprint3.cpp
+++ b/scripts/native/action/ActionSprint3.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 class ActionSprint3 : public ActionScript
 {
diff --git a/scripts/native/aetheryte/Aethernet.cpp b/scripts/native/aetheryte/Aethernet.cpp
index e0cda163..9a3ccd8f 100644
--- a/scripts/native/aetheryte/Aethernet.cpp
+++ b/scripts/native/aetheryte/Aethernet.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 #define ACTION_ATTUNE 0x13
 
diff --git a/scripts/native/aetheryte/Aetheryte.cpp b/scripts/native/aetheryte/Aetheryte.cpp
index 9f838d13..51ba6cb1 100644
--- a/scripts/native/aetheryte/Aetheryte.cpp
+++ b/scripts/native/aetheryte/Aetheryte.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 #define ACTION_ATTUNE 0x13
 #define ACTION_TELEPORT 0x4
diff --git a/scripts/native/debugcommands/Add.cpp b/scripts/native/debugcommands/Add.cpp
deleted file mode 100644
index 41031f7a..00000000
--- a/scripts/native/debugcommands/Add.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#include <ScriptObject.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Network/GamePacketNew.h>
-#include <Actor/BattleNpc.h>
-#include <Zone/Zone.h>
-
-class Add : public DebugCommandScript
-{
-public:
-   Add() : DebugCommandScript( "add", "Executes ADD command", 1 )
-   { }
-
-   virtual void run( Entity::Player& player, const std::string& data, const std::string &subCommand, const std::string &params )
-   {
-      if( subCommand == "status" )
-      {
-         int32_t id;
-         int32_t duration;
-         uint16_t param;
-
-         sscanf( params.c_str(), "%d %d %hu", &id, &duration, &param );
-
-         StatusEffect::StatusEffectPtr effect( new StatusEffect::StatusEffect( id, player.getAsPlayer(), player.getAsPlayer(), duration, 3000 ) );
-         effect->setParam( param );
-
-         player.addStatusEffect( effect );
-      }
-      else if( subCommand == "title" )
-      {
-         uint32_t titleId;
-         sscanf( params.c_str(), "%u", &titleId );
-
-         player.addTitle( titleId );
-         player.sendNotice( "Added title (ID: " + std::to_string( titleId ) + ")" );
-      }
-      else if( subCommand == "spawn" )
-      {
-         int32_t model, name;
-
-         sscanf( params.c_str(), "%d %d", &model, &name );
-
-         Entity::BattleNpcPtr pBNpc( new Entity::BattleNpc( model, name, player.getPos() ) );
-
-         auto pZone = player.getCurrentZone();
-         pBNpc->setCurrentZone( pZone );
-         pZone->pushActor( pBNpc );
-
-      }
-      else if( subCommand == "op" )
-      {
-         // temporary research packet
-         int32_t opcode;
-         sscanf( params.c_str(), "%x", &opcode );
-         Network::Packets::GamePacketPtr pPe( new Network::Packets::GamePacket( opcode, 0x30, player.getId(), player.getId() ) );
-         player.queuePacket( pPe );
-      }
-      else if( subCommand == "actrl" )
-      {
-
-         // temporary research packet
-
-         int32_t opcode;
-         int32_t param1;
-         int32_t param2;
-         int32_t param3;
-         int32_t param4;
-         int32_t param5;
-         int32_t param6;
-         int32_t playerId;
-
-         sscanf( params.c_str(), "%x %x %x %x %x %x %x %x", &opcode, &param1, &param2, &param3, &param4, &param5, &param6, &playerId );
-
-         player.sendNotice( "Injecting ACTOR_CONTROL " + std::to_string( opcode ) );
-
-         Network::Packets::ZoneChannelPacket< Network::Packets::Server::FFXIVIpcActorControl143 > actorControl( playerId, player.getId() );
-         actorControl.data().category = opcode;
-         actorControl.data().param1 = param1;
-         actorControl.data().param2 = param2;
-         actorControl.data().param3 = param3;
-         actorControl.data().param4 = param4;
-         actorControl.data().param5 = param5;
-         actorControl.data().param6 = param6;
-         player.queuePacket( actorControl );
-
-
-         /*sscanf(params.c_str(), "%x %x %x %x %x %x %x", &opcode, &param1, &param2, &param3, &param4, &param5, &param6, &playerId);
-
-         Network::Packets::Server::ServerNoticePacket noticePacket( player, "Injecting ACTOR_CONTROL " + std::to_string( opcode ) );
-
-         player.queuePacket( noticePacket );
-
-         Network::Packets::Server::ActorControlPacket143 controlPacket( player, opcode,
-         param1, param2, param3, param4, param5, param6, playerId );
-         player.queuePacket( controlPacket );*/
-
-      }
-      else
-      {
-         player.sendUrgent( subCommand + " is not a valid ADD command." );
-      }
-   }
-};
\ No newline at end of file
diff --git a/scripts/native/debugcommands/Get.cpp b/scripts/native/debugcommands/Get.cpp
deleted file mode 100644
index f20a3abe..00000000
--- a/scripts/native/debugcommands/Get.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <ScriptObject.h>
-
-#include <Zone/Zone.h>
-
-class Get : public DebugCommandScript
-{
-public:
-   Get() : DebugCommandScript( "get", "Executes GET commands", 1 )
-   { }
-
-   virtual void run( Entity::Player& player, const std::string& data, const std::string& subCommand, const std::string& params )
-   {
-      if( ( subCommand == "pos" ) )
-      {
-
-         int16_t map_id = m_objects->m_exd->m_zoneInfoMap[player.getCurrentZone()->getTerritoryId()].map_id;
-
-         player.sendNotice( "Pos:\n" +
-                            std::to_string( player.getPos().x ) + "\n" +
-                            std::to_string( player.getPos().y ) + "\n" +
-                            std::to_string( player.getPos().z ) + "\n" +
-                            std::to_string( player.getRotation() ) + "\nMapId: " +
-                            std::to_string( map_id ) + "\nZoneID: " +
-                            std::to_string(player.getCurrentZone()->getTerritoryId() ) + "\n" );
-      }
-      else
-      {
-         player.sendUrgent( subCommand + " is not a valid GET command." );
-      }
-   }
-};
\ No newline at end of file
diff --git a/scripts/native/debugcommands/Help.cpp b/scripts/native/debugcommands/Help.cpp
deleted file mode 100644
index f7ec3947..00000000
--- a/scripts/native/debugcommands/Help.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <ScriptObject.h>
-
-#include <Script/NativeScriptManager.h>
-
-class Help : public DebugCommandScript
-{
-public:
-   Help() : DebugCommandScript( "help", "Displays server build information", 0 )
-   { }
-
-   virtual void run( Entity::Player& player, const std::string& data, const std::string& subCommand, const std::string& params )
-   {
-      player.sendDebug( "Available debug commands:" );
-
-      for( std::pair< uint32_t, ScriptObject* > s : m_objects->m_scriptMgr->getNativeScriptHandler().getScriptsOfType< DebugCommandScript >() )
-      {
-         auto script = dynamic_cast< DebugCommandScript* >( s.second );
-
-         if( player.getGmRank() >= script->getGmLevel() )
-            player.sendDebug( " - " + script->getCmd() + " - " + script->getHelpText() );
-      }
-   }
-};
\ No newline at end of file
diff --git a/scripts/native/debugcommands/InjectChatPacket.cpp b/scripts/native/debugcommands/InjectChatPacket.cpp
deleted file mode 100644
index a59b6f44..00000000
--- a/scripts/native/debugcommands/InjectChatPacket.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <ScriptObject.h>
-
-#include <common/Network/PacketContainer.h>
-#include <Session.h>
-#include <Network/GameConnection.h>
-#include <common/Network/CommonNetwork.h>
-
-
-class InjectChatPacket : public DebugCommandScript
-{
-public:
-   InjectChatPacket() : DebugCommandScript( "injectc", "Injects a premade chat packet", 1 )
-   { }
-
-   virtual void run( Entity::Player& player, const std::string& data, const std::string& subCommand, const std::string& params )
-   {
-      auto pSession = m_objects->m_zone->getSession( player.getId() );
-      if( pSession )
-         pSession->getChatConnection()->injectPacket( data.c_str() + 8, player );
-   }
-};
\ No newline at end of file
diff --git a/scripts/native/debugcommands/InjectPacket.cpp b/scripts/native/debugcommands/InjectPacket.cpp
deleted file mode 100644
index a08274ab..00000000
--- a/scripts/native/debugcommands/InjectPacket.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <ScriptObject.h>
-
-#include <common/Network/PacketContainer.h>
-#include <Session.h>
-#include <Network/GameConnection.h>
-#include <common/Network/CommonNetwork.h>
-
-class InjectPacket : public DebugCommandScript
-{
-public:
-   InjectPacket() : DebugCommandScript( "inject", "Injects a premade packet", 0 )
-   { }
-
-   virtual void run( Entity::Player& player, const std::string& data, const std::string& subCommand, const std::string& params )
-   {
-      auto pSession = m_objects->m_zone->getSession( player.getId() );
-      if( pSession )
-         pSession->getZoneConnection()->injectPacket( data.c_str() + 7, player );
-   }
-};
\ No newline at end of file
diff --git a/scripts/native/debugcommands/Nudge.cpp b/scripts/native/debugcommands/Nudge.cpp
deleted file mode 100644
index f17396ab..00000000
--- a/scripts/native/debugcommands/Nudge.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <ScriptObject.h>
-#include <common/Util/UtilMath.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Network/GamePacketNew.h>
-
-class Nudge : public DebugCommandScript
-{
-public:
-   Nudge() : DebugCommandScript( "nudge", "Nudge player in a direction", 1 )
-   { }
-
-   virtual void run( Entity::Player& player, const std::string& data, const std::string& subCommand, const std::string& params )
-   {
-      // check if the command has parameters
-      std::string tmpCommand = std::string( data.c_str() + m_cmd.length() + 1 );
-
-      std::size_t spos = tmpCommand.find_first_of( " " );
-
-      auto& pos = player.getPos();
-
-      int32_t offset = 0;
-      char direction[20];
-      memset( direction, 0, 20 );
-
-      sscanf( tmpCommand.c_str(), "%d %s", &offset, direction );
-
-      if( direction[0] == 'u' || direction[0] == '+' )
-      {
-         pos.y += offset;
-         player.sendNotice( "nudge: Placing up " + std::to_string( offset ) + " yalms" );
-      }
-      else if( direction[0] == 'd' || direction[0] == '-' )
-      {
-         pos.y -= offset;
-         player.sendNotice( "nudge: Placing down " + std::to_string( offset ) + " yalms" );
-
-      }
-      else
-      {
-         float angle = player.getRotation() + ( PI / 2 );
-         pos.x -= offset * cos( angle );
-         pos.z += offset * sin( angle );
-         player.sendNotice( "nudge: Placing forward " + std::to_string( offset ) + " yalms" );
-      }
-      if( offset != 0 )
-      {
-         Network::Packets::ZoneChannelPacket< Network::Packets::Server::FFXIVIpcActorSetPos >
-            setActorPosPacket( player.getId() );
-         setActorPosPacket.data().x = player.getPos().x;
-         setActorPosPacket.data().y = player.getPos().y;
-         setActorPosPacket.data().z = player.getPos().z;
-         setActorPosPacket.data().r16 = Math::Util::floatToUInt16Rot( player.getRotation() );
-         player.queuePacket( setActorPosPacket );
-      }
-   }
-};
\ No newline at end of file
diff --git a/scripts/native/debugcommands/PreInclude.h b/scripts/native/debugcommands/PreInclude.h
deleted file mode 100644
index d64a6356..00000000
--- a/scripts/native/debugcommands/PreInclude.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef SAPPHIRE_PREINCLUDE_H
-#define SAPPHIRE_PREINCLUDE_H
-
-// fixes an issue where winsock is included before asio causing builds to fail
-#include <boost/asio.hpp>
-
-#endif //SAPPHIRE_PREINCLUDE_H
diff --git a/scripts/native/debugcommands/Replay.cpp b/scripts/native/debugcommands/Replay.cpp
deleted file mode 100644
index 1299b8a6..00000000
--- a/scripts/native/debugcommands/Replay.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <ScriptObject.h>
-#include <Session.h>
-
-class Replay : public DebugCommandScript
-{
-public:
-   Replay() : DebugCommandScript( "replay", "Replays a saved capture", 1 )
-   { }
-
-   virtual void run( Entity::Player& player, const std::string& data, const std::string& subCommand, const std::string& params )
-   {
-      if( subCommand == "start" )
-      {
-         auto pSession = m_objects->m_zone->getSession( player.getId() );
-         if( pSession )
-            pSession->startReplay( params );
-      }
-      else if( subCommand == "stop" )
-      {
-         auto pSession = m_objects->m_zone->getSession( player.getId() );
-         if( pSession )
-            pSession->stopReplay();
-      }
-      else
-      {
-         player.sendUrgent( subCommand + " is not a valid replay command." );
-      }
-   }
-};
\ No newline at end of file
diff --git a/scripts/native/debugcommands/Script.cpp b/scripts/native/debugcommands/Script.cpp
deleted file mode 100644
index 3e461eff..00000000
--- a/scripts/native/debugcommands/Script.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <ScriptObject.h>
-
-#include <Script/NativeScriptManager.h>
-#include <boost/format.hpp>
-
-class Script : public DebugCommandScript
-{
-public:
-   Script() : DebugCommandScript( "script", "Script management commands", 0 )
-   { }
-
-   virtual void run( Entity::Player& player, const std::string& args, const std::string& subCommand, const std::string& params )
-   {
-      if( subCommand == "unload" )
-      {
-         if ( subCommand == params )
-            player.sendDebug( "Command failed: requires name of script" );
-         else
-         if( m_objects->m_scriptMgr->getNativeScriptHandler().unloadScript( params ) )
-            player.sendDebug( "Unloaded script successfully." );
-         else
-            player.sendDebug( "Failed to unload script: " + params );
-      }
-      else if( subCommand == "find" || subCommand == "f" )
-      {
-         if( subCommand == params )
-            player.sendDebug( "Because reasons of filling chat with nonsense, please enter a search term" );
-         else
-         {
-            std::set< Core::Scripting::ScriptInfo* > scripts;
-            m_objects->m_scriptMgr->getNativeScriptHandler().findScripts( scripts, params );
-
-            if( !scripts.empty() )
-            {
-               player.sendDebug( "Found " + std::to_string( scripts.size() ) + " scripts" );
-
-               for( auto it = scripts.begin(); it != scripts.end(); ++it )
-               {
-                  auto script = *it;
-                  player.sendDebug( " - '" + script->library_name + "' loaded at @ 0x" +
-                                    boost::str( boost::format( "%|X|" ) % script->handle ) +
-                                    ", num scripts: " + std::to_string( script->scripts.size() ) );
-               }
-            }
-            else
-               player.sendDebug( "No scripts found with search term: " + params );
-         }
-      }
-      else if( subCommand == "load" || subCommand == "l" )
-      {
-         if( subCommand == params )
-            player.sendDebug( "Command failed: requires relative path to script" );
-         else
-         {
-            if ( m_objects->m_scriptMgr->getNativeScriptHandler().loadScript( params ) )
-               player.sendDebug( "Loaded '" + params + "' successfully" );
-            else
-               player.sendDebug( "Failed to load '" + params + "'" );
-         }
-
-      }
-      else if( subCommand == "queuereload" || subCommand == "qrl" )
-      {
-         if( subCommand == params )
-            player.sendDebug( "Command failed: requires name of script to reload" );
-         else
-         {
-            m_objects->m_scriptMgr->getNativeScriptHandler().queueScriptReload( params );
-            player.sendDebug( "Queued script reload for script: " + params );
-         }
-      }
-      else if( subCommand == "build" || subCommand == "b" )
-      {
-         if( subCommand == params )
-            player.sendDebug( "Command failed: requires name of cmake target" );
-         else
-         {
-
-         }
-      }
-      else
-      {
-         player.sendDebug( "Unknown script subcommand: " + subCommand );
-      }
-   }
-};
\ No newline at end of file
diff --git a/scripts/native/debugcommands/ServerInfo.cpp b/scripts/native/debugcommands/ServerInfo.cpp
deleted file mode 100644
index dd804141..00000000
--- a/scripts/native/debugcommands/ServerInfo.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <ScriptObject.h>
-
-#include <common/Version.h>
-
-class ServerInfo : public DebugCommandScript
-{
-public:
-   ServerInfo() : DebugCommandScript( "serverinfo", "Displays server build information", 0 )
-   { }
-
-   virtual void run( Entity::Player& player, const std::string& data, const std::string& subCommand, const std::string& params )
-   {
-      player.sendDebug( "Sapphire Zone " + Version::VERSION + "\nRev: " + Version::GIT_HASH );
-      player.sendDebug( "Compiled: " __DATE__ " " __TIME__ );
-      player.sendDebug( "Sessions: " + std::to_string( m_objects->m_zone->getSessionCount() ) );
-   }
-};
\ No newline at end of file
diff --git a/scripts/native/debugcommands/Set.cpp b/scripts/native/debugcommands/Set.cpp
deleted file mode 100644
index d9b1747a..00000000
--- a/scripts/native/debugcommands/Set.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-#include <ScriptObject.h>
-
-#include <Session.h>
-#include <common/Network/PacketContainer.h>
-#include <Network/GameConnection.h>
-#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
-#include <common/Network/GamePacketNew.h>
-#include <servers/sapphire_zone/Network/PacketWrappers/InitUIPacket.h>
-#include <cinttypes>
-
-class Set : public DebugCommandScript
-{
-public:
-   Set() : DebugCommandScript( "set", "Executes SET commands", 1 )
-   { }
-
-   virtual void run( Entity::Player& player, const std::string& data, const std::string& subCommand, const std::string& params )
-   {
-      if( ( ( subCommand == "pos" ) || ( subCommand == "posr" ) ) && ( params != "" ) )
-      {
-         int32_t posX;
-         int32_t posY;
-         int32_t posZ;
-
-         sscanf( params.c_str(), "%d %d %d", &posX, &posY, &posZ );
-
-         if( ( posX == 0xcccccccc ) || ( posY == 0xcccccccc ) || ( posZ == 0xcccccccc ) )
-         {
-            player.sendUrgent( "Syntaxerror." );
-            return;
-         }
-
-         if( subCommand == "pos" )
-            player.setPosition( static_cast< float >( posX ),
-                                static_cast< float >( posY ),
-                                static_cast< float >( posZ ) );
-         else
-            player.setPosition( player.getPos().x + static_cast< float >( posX ),
-                                player.getPos().y + static_cast< float >( posY ),
-                                player.getPos().z + static_cast< float >( posZ ) );
-
-         Network::Packets::ZoneChannelPacket< Network::Packets::Server::FFXIVIpcActorSetPos >
-            setActorPosPacket( player.getId() );
-         setActorPosPacket.data().x = player.getPos().x;
-         setActorPosPacket.data().y = player.getPos().y;
-         setActorPosPacket.data().z = player.getPos().z;
-         player.queuePacket( setActorPosPacket );
-
-      }
-      else if( ( subCommand == "tele" ) && ( params != "" ) )
-      {
-         int32_t aetheryteId;
-         sscanf( params.c_str(), "%i", &aetheryteId );
-
-         player.teleport( aetheryteId );
-      }
-      else if( ( subCommand == "discovery" ) && ( params != "" ) )
-      {
-         int32_t map_id;
-         int32_t discover_id;
-         sscanf( params.c_str(), "%i %i", &map_id, &discover_id );
-
-         Network::Packets::ZoneChannelPacket< Network::Packets::Server::FFXIVIpcDiscovery > discoveryPacket( player.getId() );
-         discoveryPacket.data().map_id = map_id;
-         discoveryPacket.data().map_part_id = discover_id;
-         player.queuePacket( discoveryPacket );
-      }
-
-//      else if( ( subCommand == "discovery_pos" ) && ( params != "" ) )
-//      {
-//         int32_t map_id;
-//         int32_t discover_id;
-//         int32_t pos_id;
-//         sscanf( params.c_str(), "%i %i %i", &pos_id, &map_id, &discover_id );
-//
-//         std::string query2 = "UPDATE IGNORE `discoveryinfo` SET `discover_id` = '" + std::to_string( discover_id ) +
-//                              "' WHERE `discoveryinfo`.`id` = " + std::to_string( pos_id ) + ";";
-//
-//         std::string query1 = "INSERT IGNORE INTO `discoveryinfo` (`id`, `map_id`, `discover_id`) VALUES ('" + std::to_string( pos_id ) +
-//                              "', '" + std::to_string( map_id ) +
-//                              "', '" + std::to_string( discover_id ) + "')";
-//
-//         g_charaDb.execute( query1 );
-//         g_charaDb.execute( query2 );
-//
-//      }
-
-      else if( subCommand == "discovery_reset" )
-      {
-         player.resetDiscovery();
-         player.queuePacket( Network::Packets::Server::InitUIPacket( player ) );
-      }
-      else if( subCommand == "classjob" )
-      {
-         int32_t id;
-
-         sscanf( params.c_str(), "%d", &id );
-
-         if( player.getLevelForClass( static_cast< Common::ClassJob > ( id ) ) == 0 )
-         {
-            player.setLevelForClass( 1, static_cast< Common::ClassJob > ( id ) );
-            player.setClassJob( static_cast< Common::ClassJob > ( id ) );
-         }
-         else
-            player.setClassJob( static_cast< Common::ClassJob > ( id ) );
-      }
-      else if ( subCommand == "cfpenalty" )
-      {
-         int32_t minutes;
-         sscanf( params.c_str(), "%d", &minutes );
-
-         player.setCFPenaltyMinutes( minutes );
-      }
-      else if ( subCommand == "eorzeatime" )
-      {
-         uint64_t timestamp;
-         sscanf( params.c_str(), "%" SCNu64, &timestamp );
-
-         player.setEorzeaTimeOffset( timestamp );
-         player.sendNotice( "Eorzea time offset: " + std::to_string( timestamp ) );
-      }
-      else if ( subCommand == "model" )
-      {
-         uint32_t slot;
-         uint32_t val;
-         sscanf( params.c_str(), "%d %d", &slot, &val );
-
-         player.setModelForSlot( static_cast< Inventory::EquipSlot >( slot ), val );
-         player.sendModel();
-         player.sendDebug( "Model updated" );
-      }
-      else if ( subCommand == "mount" )
-      {
-         int32_t id;
-         sscanf( params.c_str(), "%d", &id );
-
-         player.dismount();
-         player.mount( id );
-      }
-      else
-      {
-         player.sendUrgent( subCommand + " is not a valid SET command." );
-      }
-   }
-};
\ No newline at end of file
diff --git a/scripts/native/opening/OpeningGridania.cpp b/scripts/native/opening/OpeningGridania.cpp
index 1541561c..9f6d6f0a 100644
--- a/scripts/native/opening/OpeningGridania.cpp
+++ b/scripts/native/opening/OpeningGridania.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 class OpeningGridania : public EventScript
 {
diff --git a/scripts/native/opening/OpeningLimsa.cpp b/scripts/native/opening/OpeningLimsa.cpp
index f30a2aed..a40ea482 100644
--- a/scripts/native/opening/OpeningLimsa.cpp
+++ b/scripts/native/opening/OpeningLimsa.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 // Opening Script: OpeningLimsaLominsa
 // Quest Name: OpeningLimsaLominsa
diff --git a/scripts/native/opening/OpeningUldah.cpp b/scripts/native/opening/OpeningUldah.cpp
index c780782e..fdd1c5d2 100644
--- a/scripts/native/opening/OpeningUldah.cpp
+++ b/scripts/native/opening/OpeningUldah.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 class OpeningUldah : public EventScript
 {
diff --git a/scripts/native/quest/ManFst001.cpp b/scripts/native/quest/ManFst001.cpp
index df85953a..b73581ac 100644
--- a/scripts/native/quest/ManFst001.cpp
+++ b/scripts/native/quest/ManFst001.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 // Quest Script: ManFst001_00039
 // Quest Name: Coming to Gridania
diff --git a/scripts/native/quest/ManFst002.cpp b/scripts/native/quest/ManFst002.cpp
index 1943f599..707150cb 100644
--- a/scripts/native/quest/ManFst002.cpp
+++ b/scripts/native/quest/ManFst002.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 // Quest Script: ManFst002_00124
 // Quest Name: Close to Home
diff --git a/scripts/native/quest/ManFst003.cpp b/scripts/native/quest/ManFst003.cpp
index 00ecbb90..c8cd4da6 100644
--- a/scripts/native/quest/ManFst003.cpp
+++ b/scripts/native/quest/ManFst003.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 // Quest Script: ManFst003_00123
 // Quest Name: Close to Home
diff --git a/scripts/native/quest/ManSea001.cpp b/scripts/native/quest/ManSea001.cpp
index 5921e09d..aee4da80 100644
--- a/scripts/native/quest/ManSea001.cpp
+++ b/scripts/native/quest/ManSea001.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 class ManSea001 : public EventScript
 {
diff --git a/scripts/native/quest/ManSea002.cpp b/scripts/native/quest/ManSea002.cpp
index f2fab3a3..57d7dda7 100644
--- a/scripts/native/quest/ManSea002.cpp
+++ b/scripts/native/quest/ManSea002.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 // Quest Script: ManSea002_00108
 // Quest Name: Close to Home
diff --git a/scripts/native/quest/ManWil001.cpp b/scripts/native/quest/ManWil001.cpp
index 9be159d7..ee04e2aa 100644
--- a/scripts/native/quest/ManWil001.cpp
+++ b/scripts/native/quest/ManWil001.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 // Quest Script: ManWil001_00594
 // Quest Name: Coming to Ul'dah
diff --git a/scripts/native/quest/ManWil002.cpp b/scripts/native/quest/ManWil002.cpp
index e51e1a8b..9f160f72 100644
--- a/scripts/native/quest/ManWil002.cpp
+++ b/scripts/native/quest/ManWil002.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../ScriptObject.h"
 
 // Quest Script: ManWil002_00568
 // Quest Name: Close to Home
diff --git a/scripts/native/quest/subquest/gridania/SubFst001.cpp b/scripts/native/quest/subquest/gridania/SubFst001.cpp
index 55da6d99..2aedc7f8 100644
--- a/scripts/native/quest/subquest/gridania/SubFst001.cpp
+++ b/scripts/native/quest/subquest/gridania/SubFst001.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../../../ScriptObject.h"
 
 // Quest Script: SubFst001_00024
 // Quest Name: Coarse Correspondence
diff --git a/scripts/native/quest/subquest/gridania/SubFst002.cpp b/scripts/native/quest/subquest/gridania/SubFst002.cpp
index d2cff2e4..2e32fa23 100644
--- a/scripts/native/quest/subquest/gridania/SubFst002.cpp
+++ b/scripts/native/quest/subquest/gridania/SubFst002.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../../../ScriptObject.h"
 
 // Quest Script: SubFst002_00025
 // Quest Name: Quarrels with Squirrels
diff --git a/scripts/native/quest/subquest/gridania/SubFst010.cpp b/scripts/native/quest/subquest/gridania/SubFst010.cpp
index cbabe1b3..e3e03582 100644
--- a/scripts/native/quest/subquest/gridania/SubFst010.cpp
+++ b/scripts/native/quest/subquest/gridania/SubFst010.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../../../ScriptObject.h"
 
 // Quest Script: SubFst010_00001
 // Quest Name: A Good Adventurer Is Hard to Find
diff --git a/scripts/native/quest/subquest/gridania/SubFst013.cpp b/scripts/native/quest/subquest/gridania/SubFst013.cpp
index 45f8824f..7bf4f6da 100644
--- a/scripts/native/quest/subquest/gridania/SubFst013.cpp
+++ b/scripts/native/quest/subquest/gridania/SubFst013.cpp
@@ -1,4 +1,4 @@
-#include <ScriptObject.h>
+#include "../../../ScriptObject.h"
 
 // Quest Script: SubFst013_00040
 // Quest Name: For Friendship
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommand.h b/src/servers/sapphire_zone/DebugCommand/DebugCommand.h
new file mode 100644
index 00000000..03c01a30
--- /dev/null
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommand.h
@@ -0,0 +1,64 @@
+#ifndef _GAMECOMMAND_H_
+#define _GAMECOMMAND_H_
+
+#include <common/Common.h>
+
+#include "Actor/Player.h"
+#include "Forwards.h"
+
+namespace Core {
+
+   class DebugCommandHandler;
+
+   class DebugCommand
+   { 
+   public:
+
+      using pFunc = void ( DebugCommandHandler::* )( char *, Entity::Player&, boost::shared_ptr< DebugCommand > );
+
+      // String for the command
+      std::string m_commandName;
+
+      // command callback
+      pFunc m_pFunc;
+
+      // helptext 
+      std::string m_helpText; 
+
+      // userlevel needed to execute the command
+      uint8_t m_gmLevel;
+
+      DebugCommand( const std::string& n, pFunc functionPtr, const std::string& hText, uint8_t uLevel )
+      {
+         m_commandName = n;
+         m_pFunc = functionPtr;
+         m_helpText = hText;
+         m_gmLevel = uLevel;
+      }
+
+      ~DebugCommand()
+      {
+
+      }
+
+      const std::string& getName() const
+      {
+         return m_commandName;
+      }
+
+      const std::string& getHelpText() const
+      {
+         return m_helpText;
+      }
+
+      uint8_t getRequiredGmLevel() const
+      {
+         return m_gmLevel;
+      }
+
+   };
+
+}
+
+
+#endif
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
new file mode 100644
index 00000000..04c6a633
--- /dev/null
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -0,0 +1,657 @@
+#include <boost/lexical_cast.hpp>
+
+#include <common/Common.h>
+#include <common/Version.h>
+#include <common/Network/GamePacketNew.h>
+#include <common/Network/CommonNetwork.h>
+#include <common/Util/UtilMath.h>
+#include <common/Network/PacketContainer.h>
+#include <common/Logging/Logger.h>
+#include <common/Exd/ExdData.h>
+#include <common/Database/DatabaseDef.h>
+
+#include "DebugCommand.h"
+#include "DebugCommandHandler.h"
+
+#include "Network/PacketWrappers/ServerNoticePacket.h"
+#include "Network/PacketWrappers/ActorControlPacket142.h"
+#include "Network/PacketWrappers/ActorControlPacket143.h"
+#include "Network/PacketWrappers/InitUIPacket.h"
+#include "Network/GameConnection.h"
+#include "Script/ScriptManager.h"
+#include "Script/NativeScriptManager.h"
+
+#include "Actor/Player.h"
+#include "Actor/BattleNpc.h"
+
+#include "Zone/Zone.h"
+
+#include "ServerZone.h"
+
+#include "StatusEffect/StatusEffect.h"
+#include "Session.h"
+#include <boost/make_shared.hpp>
+#include <boost/format.hpp>
+
+
+#include <cinttypes>
+
+extern Core::Scripting::ScriptManager g_scriptMgr;
+extern Core::Data::ExdData g_exdData;
+extern Core::Logger g_log;
+extern Core::ServerZone g_serverZone;
+
+// instanciate and initialize commands
+Core::DebugCommandHandler::DebugCommandHandler()
+{
+   // Push all commands onto the register map ( command name - function - description - required GM level )
+   registerCommand( "set", &DebugCommandHandler::set, "Executes SET commands.", 1 );
+   registerCommand( "get", &DebugCommandHandler::get, "Executes GET commands.", 1 );
+   registerCommand( "add", &DebugCommandHandler::add, "Executes ADD commands.", 1 );
+   registerCommand( "inject", &DebugCommandHandler::injectPacket, "Loads and injects a premade packet.", 1 );
+   registerCommand( "injectc", &DebugCommandHandler::injectChatPacket, "Loads and injects a premade chat packet.", 1 );
+   registerCommand( "replay", &DebugCommandHandler::replay, "Replays a saved capture folder.", 1 );
+   registerCommand( "nudge", &DebugCommandHandler::nudge, "Nudges you forward/up/down.", 1 );
+   registerCommand( "info", &DebugCommandHandler::serverInfo, "Show server info.", 0 );
+   registerCommand( "unlock", &DebugCommandHandler::unlockCharacter, "Unlock character.", 1 );
+   registerCommand( "help", &DebugCommandHandler::help, "Shows registered commands.", 0 );
+   registerCommand( "script", &DebugCommandHandler::script, "Server script utilities.", 1 );
+}
+
+// clear all loaded commands
+Core::DebugCommandHandler::~DebugCommandHandler()
+{
+   for( auto it = m_commandMap.begin(); it != m_commandMap.end(); ++it )
+      ( *it ).second.reset();
+}
+
+// add a command set to the register map
+void Core::DebugCommandHandler::registerCommand( const std::string& n, DebugCommand::pFunc functionPtr,
+                                                 const std::string& hText, uint8_t uLevel )
+{
+   m_commandMap[std::string( n )] = boost::make_shared< DebugCommand >( n, functionPtr, hText, uLevel );
+}
+
+// try to retrieve the command in question, execute if found
+void Core::DebugCommandHandler::execCommand( char * data, Entity::Player& player )
+{
+
+   // define callback pointer
+   void ( DebugCommandHandler::*pf )( char *, Entity::Player&, boost::shared_ptr< DebugCommand > );
+
+   std::string commandString;
+
+   // check if the command has parameters
+   std::string tmpCommand = std::string( data );
+   std::size_t pos = tmpCommand.find_first_of( " " );
+
+   if( pos != std::string::npos )
+      // command has parameters, grab the first part
+      commandString = tmpCommand.substr( 0, pos );
+   else
+      // no parameters, just get the command
+      commandString = tmpCommand;
+
+   // try to retrieve the command
+   auto it = m_commandMap.find( commandString );
+
+   if( it == m_commandMap.end() )
+      // no command found, do something... or not
+      player.sendUrgent( "Command not found." );
+   else
+   {
+      if( player.getGmRank() < it->second->getRequiredGmLevel() )
+      {
+         player.sendUrgent( "You are not allowed to use this command." );
+         return;
+      }
+
+      // command found, call the callback function and pass parameters if present.
+      pf = ( *it ).second->m_pFunc;
+      ( this->*pf )( data, player, ( *it ).second );
+      return;
+   }
+
+
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////
+// Definition of the commands
+///////////////////////////////////////////////////////////////////////////////////////
+
+void Core::DebugCommandHandler::help( char* data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
+{
+   player.sendDebug( "Registered debug commands:" );
+   for ( auto cmd : m_commandMap )
+   {
+      if ( player.getGmRank( ) >= cmd.second->m_gmLevel )
+      {
+         player.sendDebug( " - " + cmd.first + " - " + cmd.second->getHelpText( ) );
+      }
+   }
+}
+
+void Core::DebugCommandHandler::set( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
+{
+   std::string subCommand = "";
+   std::string params = "";
+
+   // check if the command has parameters
+   std::string tmpCommand = std::string( data + command->getName().length() + 1 );
+
+   std::size_t pos = tmpCommand.find_first_of( " " );
+
+   if( pos != std::string::npos )
+      // command has parameters, grab the first part
+      subCommand = tmpCommand.substr( 0, pos );
+   else
+      // no subcommand given
+      subCommand = tmpCommand;
+
+   if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
+      params = std::string( data + command->getName().length() + 1 + pos + 1 );
+
+   g_log.debug( "[" + std::to_string( player.getId() ) + "] " +
+                "subCommand " + subCommand + " params: " + params );
+
+
+   if( ( ( subCommand == "pos" ) || ( subCommand == "posr" ) ) && ( params != "" ) )
+   {
+      int32_t posX;
+      int32_t posY;
+      int32_t posZ;
+
+      sscanf( params.c_str(), "%d %d %d", &posX, &posY, &posZ );
+
+      if( ( posX == 0xcccccccc ) || ( posY == 0xcccccccc ) || ( posZ == 0xcccccccc ) )
+      {
+         player.sendUrgent( "Syntaxerror." );
+         return;
+      }
+
+      if( subCommand == "pos" )
+         player.setPosition( static_cast< float >( posX ),
+                             static_cast< float >( posY ),
+                             static_cast< float >( posZ ) );
+      else
+         player.setPosition( player.getPos().x + static_cast< float >( posX ),
+                             player.getPos().y + static_cast< float >( posY ),
+                             player.getPos().z + static_cast< float >( posZ ) );
+
+      Network::Packets::ZoneChannelPacket< Network::Packets::Server::FFXIVIpcActorSetPos >
+         setActorPosPacket( player.getId() );
+      setActorPosPacket.data().x = player.getPos().x;
+      setActorPosPacket.data().y = player.getPos().y;
+      setActorPosPacket.data().z = player.getPos().z;
+      player.queuePacket( setActorPosPacket );
+
+   }
+   else if( ( subCommand == "tele" ) && ( params != "" ) )
+   {
+      int32_t aetheryteId;
+      sscanf( params.c_str(), "%i", &aetheryteId );
+
+      player.teleport( aetheryteId );
+   }
+   else if( ( subCommand == "discovery" ) && ( params != "" ) )
+   {
+      int32_t map_id;
+      int32_t discover_id;
+      sscanf( params.c_str(), "%i %i", &map_id, &discover_id );
+
+      Network::Packets::ZoneChannelPacket< Network::Packets::Server::FFXIVIpcDiscovery > discoveryPacket( player.getId() );
+      discoveryPacket.data().map_id = map_id;
+      discoveryPacket.data().map_part_id = discover_id;
+      player.queuePacket( discoveryPacket );
+   }
+
+   else if( ( subCommand == "discovery_pos" ) && ( params != "" ) )
+   {
+      int32_t map_id;
+      int32_t discover_id;
+      int32_t pos_id;
+      sscanf( params.c_str(), "%i %i %i", &pos_id, &map_id, &discover_id );
+
+      std::string query2 = "UPDATE IGNORE `discoveryinfo` SET `discover_id` = '" + std::to_string( discover_id ) +
+         "' WHERE `discoveryinfo`.`id` = " + std::to_string( pos_id ) + ";";
+
+      std::string query1 = "INSERT IGNORE INTO `discoveryinfo` (`id`, `map_id`, `discover_id`) VALUES ('" + std::to_string( pos_id ) +
+         "', '" + std::to_string( map_id ) +
+         "', '" + std::to_string( discover_id ) + "')";
+
+      g_charaDb.execute( query1 );
+      g_charaDb.execute( query2 );
+
+   }
+
+   else if( subCommand == "discovery_reset" )
+   {
+      player.resetDiscovery();
+      player.queuePacket( Network::Packets::Server::InitUIPacket( player ) );
+   }
+   else if( subCommand == "classjob" )
+   {
+       int32_t id;
+
+       sscanf( params.c_str(), "%d", &id );
+
+       if( player.getLevelForClass( static_cast< Common::ClassJob > ( id ) ) == 0 )
+       {
+           player.setLevelForClass( 1, static_cast< Common::ClassJob > ( id ) );
+           player.setClassJob( static_cast< Common::ClassJob > ( id ) );
+       }
+       else
+           player.setClassJob( static_cast< Common::ClassJob > ( id ) );
+   }
+   else if ( subCommand == "cfpenalty" )
+   {
+      int32_t minutes;
+      sscanf( params.c_str(), "%d", &minutes );
+
+      player.setCFPenaltyMinutes( minutes );
+   }
+   else if ( subCommand == "eorzeatime" )
+   {
+      uint64_t timestamp;
+      sscanf( params.c_str(), "%" SCNu64, &timestamp );
+
+      player.setEorzeaTimeOffset( timestamp );
+      player.sendNotice( "Eorzea time offset: " + std::to_string( timestamp ) );
+   }
+   else if ( subCommand == "model" )
+   {
+      uint32_t slot;
+      uint32_t val;
+      sscanf( params.c_str(), "%d %d", &slot, &val );
+
+      player.setModelForSlot( static_cast< Inventory::EquipSlot >( slot ), val );
+      player.sendModel();
+      player.sendDebug( "Model updated" );
+   }
+   else if ( subCommand == "mount" )
+   {
+      int32_t id;
+      sscanf( params.c_str(), "%d", &id );
+
+      player.dismount();
+      player.mount( id );
+   }
+   else
+   {
+      player.sendUrgent( subCommand + " is not a valid SET command." );
+   }
+
+}
+
+void Core::DebugCommandHandler::add( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
+{
+   std::string subCommand;
+   std::string params = "";
+
+   // check if the command has parameters
+   std::string tmpCommand = std::string( data + command->getName().length() + 1 );
+
+   std::size_t pos = tmpCommand.find_first_of( " " );
+
+   if( pos != std::string::npos )
+      // command has parameters, grab the first part
+      subCommand = tmpCommand.substr( 0, pos );
+   else
+      // no subcommand given
+      subCommand = tmpCommand;
+
+   if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
+      params = std::string( data + command->getName().length() + 1 + pos + 1 );
+
+   g_log.debug( "[" + std::to_string( player.getId() ) + "] " +
+                "subCommand " + subCommand + " params: " + params );
+
+
+   if( subCommand == "status" )
+   {
+      int32_t id;
+      int32_t duration;
+      uint16_t param;
+
+      sscanf( params.c_str(), "%d %d %hu", &id, &duration, &param );
+
+      StatusEffect::StatusEffectPtr effect( new StatusEffect::StatusEffect( id, player.getAsPlayer(), player.getAsPlayer(), duration, 3000 ) );
+      effect->setParam( param );
+
+      player.addStatusEffect( effect );
+   }
+   else if( subCommand == "title" )
+   {
+      uint32_t titleId;
+      sscanf( params.c_str(), "%u", &titleId );
+
+      player.addTitle( titleId );
+      player.sendNotice( "Added title (ID: " + std::to_string( titleId ) + ")" );
+   }
+   else if( subCommand == "spawn" )
+   {
+      int32_t model, name;
+
+      sscanf( params.c_str(), "%d %d", &model, &name );
+
+      Entity::BattleNpcPtr pBNpc( new Entity::BattleNpc( model, name, player.getPos() ) );
+
+      auto pZone = player.getCurrentZone();
+      pBNpc->setCurrentZone( pZone );
+      pZone->pushActor( pBNpc );
+
+   }
+   else if( subCommand == "op" )
+   {
+      // temporary research packet
+      int32_t opcode;
+      sscanf( params.c_str(), "%x", &opcode );
+      Network::Packets::GamePacketPtr pPe( new Network::Packets::GamePacket( opcode, 0x30, player.getId(), player.getId() ) );
+      player.queuePacket( pPe );
+   }
+   else if( subCommand == "actrl" )
+   {
+
+      // temporary research packet
+
+      int32_t opcode;
+      int32_t param1;
+      int32_t param2;
+      int32_t param3;
+      int32_t param4;
+      int32_t param5;
+      int32_t param6;
+      int32_t playerId;
+
+      sscanf( params.c_str(), "%x %x %x %x %x %x %x %x", &opcode, &param1, &param2, &param3, &param4, &param5, &param6, &playerId );
+
+      player.sendNotice( "Injecting ACTOR_CONTROL " + std::to_string( opcode ) );
+
+      Network::Packets::ZoneChannelPacket< Network::Packets::Server::FFXIVIpcActorControl143 > actorControl( playerId, player.getId() );
+      actorControl.data().category = opcode;
+      actorControl.data().param1 = param1;
+      actorControl.data().param2 = param2;
+      actorControl.data().param3 = param3;
+      actorControl.data().param4 = param4;
+      actorControl.data().param5 = param5;
+      actorControl.data().param6 = param6;
+      player.queuePacket( actorControl );
+
+
+      /*sscanf(params.c_str(), "%x %x %x %x %x %x %x", &opcode, &param1, &param2, &param3, &param4, &param5, &param6, &playerId);
+
+      Network::Packets::Server::ServerNoticePacket noticePacket( player, "Injecting ACTOR_CONTROL " + std::to_string( opcode ) );
+
+      player.queuePacket( noticePacket );
+
+      Network::Packets::Server::ActorControlPacket143 controlPacket( player, opcode,
+      param1, param2, param3, param4, param5, param6, playerId );
+      player.queuePacket( controlPacket );*/
+
+   }
+   else
+   {
+      player.sendUrgent( subCommand + " is not a valid ADD command." );
+   }
+
+
+}
+
+void Core::DebugCommandHandler::get( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
+{
+   std::string subCommand;
+   std::string params = "";
+
+   // check if the command has parameters
+   std::string tmpCommand = std::string( data + command->getName().length() + 1 );
+
+   std::size_t pos = tmpCommand.find_first_of( " " );
+
+   if( pos != std::string::npos )
+      // command has parameters, grab the first part
+      subCommand = tmpCommand.substr( 0, pos );
+   else
+      // no subcommand given
+      subCommand = tmpCommand;
+
+   if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
+      params = std::string( data + command->getName().length() + 1 + pos + 1 );
+
+   g_log.debug( "[" + std::to_string( player.getId() ) + "] " +
+                "subCommand " + subCommand + " params: " + params );
+
+
+   if( ( subCommand == "pos" ) )
+   {
+
+      int16_t map_id = g_exdData.m_zoneInfoMap[player.getCurrentZone()->getTerritoryId()].map_id;
+
+      player.sendNotice( "Pos:\n" +
+                         std::to_string( player.getPos().x ) + "\n" +
+                         std::to_string( player.getPos().y ) + "\n" +
+                         std::to_string( player.getPos().z ) + "\n" +
+                         std::to_string( player.getRotation() ) + "\nMapId: " +
+                         std::to_string( map_id ) + "\nZoneID: " +
+                         std::to_string(player.getCurrentZone()->getTerritoryId() ) + "\n" );
+   }
+   else
+   {
+      player.sendUrgent( subCommand + " is not a valid GET command." );
+   }
+
+}
+
+void Core::DebugCommandHandler::injectPacket( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
+{
+   auto pSession = g_serverZone.getSession( player.getId() );
+   if( pSession )
+      pSession->getZoneConnection()->injectPacket( data + 7, player );
+}
+
+void Core::DebugCommandHandler::injectChatPacket( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
+{
+   auto pSession = g_serverZone.getSession( player.getId() );
+   if( pSession )
+      pSession->getChatConnection()->injectPacket( data + 8, player );
+}
+
+void Core::DebugCommandHandler::replay( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
+{
+   std::string subCommand;
+   std::string params = "";
+
+   // check if the command has parameters
+   std::string tmpCommand = std::string( data + command->getName().length() + 1 );
+
+   std::size_t pos = tmpCommand.find_first_of( " " );
+
+   if( pos != std::string::npos )
+      // command has parameters, grab the first part
+      subCommand = tmpCommand.substr( 0, pos );
+   else
+      // no subcommand given
+      subCommand = tmpCommand;
+
+   if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
+      params = std::string( data + command->getName().length() + 1 + pos + 1 );
+
+   g_log.debug( "[" + std::to_string( player.getId() ) + "] " +
+                "subCommand " + subCommand + " params: " + params );
+
+
+   if( subCommand == "start" )
+   {
+      auto pSession = g_serverZone.getSession( player.getId() );
+      if( pSession )
+         pSession->startReplay( params );
+   }
+   else if( subCommand == "stop" )
+   {
+      auto pSession = g_serverZone.getSession( player.getId() );
+      if( pSession )
+         pSession->stopReplay();
+   }
+   else
+   {
+      player.sendUrgent( subCommand + " is not a valid replay command." );
+   }
+
+   
+}
+
+void Core::DebugCommandHandler::nudge( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
+{
+   std::string subCommand;
+
+   // check if the command has parameters
+   std::string tmpCommand = std::string( data + command->getName().length() + 1 );
+
+   std::size_t spos = tmpCommand.find_first_of( " " );
+
+   auto& pos = player.getPos();
+
+   int32_t offset = 0;
+   char direction[20];
+   memset( direction, 0, 20 );
+
+   sscanf( tmpCommand.c_str(), "%d %s", &offset, direction );
+
+   if( direction[0] == 'u' || direction[0] == '+' )
+   {
+      pos.y += offset;
+      player.sendNotice( "nudge: Placing up " + std::to_string( offset ) + " yalms" );
+   }
+   else if( direction[0] == 'd' || direction[0] == '-' )
+   {
+      pos.y -= offset;
+      player.sendNotice( "nudge: Placing down " + std::to_string( offset ) + " yalms" );
+
+   }
+   else
+   {
+      float angle = player.getRotation() + ( PI / 2 );
+      pos.x -= offset * cos( angle );
+      pos.z += offset * sin( angle );
+      player.sendNotice( "nudge: Placing forward " + std::to_string( offset ) + " yalms" );
+   }
+   if( offset != 0 )
+   {
+      Network::Packets::ZoneChannelPacket< Network::Packets::Server::FFXIVIpcActorSetPos >
+         setActorPosPacket( player.getId() );
+      setActorPosPacket.data().x = player.getPos().x;
+      setActorPosPacket.data().y = player.getPos().y;
+      setActorPosPacket.data().z = player.getPos().z;
+      setActorPosPacket.data().r16 = Math::Util::floatToUInt16Rot( player.getRotation() );
+      player.queuePacket( setActorPosPacket );
+   }
+}
+
+void Core::DebugCommandHandler::serverInfo( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
+{
+   player.sendDebug( "SapphireServer " + Version::VERSION + "\nRev: " + Version::GIT_HASH );
+   player.sendDebug( "Compiled: " __DATE__ " " __TIME__ );
+   player.sendDebug( "Sessions: " + std::to_string( g_serverZone.getSessionCount() ) );
+}
+
+void Core::DebugCommandHandler::unlockCharacter( char* data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
+{
+   player.unlock();
+}
+
+void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boost::shared_ptr< DebugCommand > command )
+{
+   std::string subCommand;
+   std::string params = "";
+
+   // check if the command has parameters
+   std::string tmpCommand = std::string( data + command->getName().length() + 1 );
+
+   std::size_t pos = tmpCommand.find_first_of( " " );
+
+   if( pos != std::string::npos )
+      // command has parameters, grab the first part
+      subCommand = tmpCommand.substr( 0, pos );
+   else
+      // no subcommand given
+      subCommand = tmpCommand;
+
+   // todo: fix params so it's empty if there's no params
+   if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
+      params = std::string( data + command->getName().length() + 1 + pos + 1 );
+
+   g_log.debug( "[" + std::to_string( player.getId() ) + "] " +
+                "subCommand " + subCommand + " params: " + params );
+
+   if( subCommand == "unload" )
+   {
+      if ( subCommand == params )
+         player.sendDebug( "Command failed: requires name of script" );
+      else
+         if( g_scriptMgr.getNativeScriptHandler().unloadScript( params ) )
+            player.sendDebug( "Unloaded script successfully." );
+         else
+            player.sendDebug( "Failed to unload script: " + params );
+   }
+   else if( subCommand == "find" || subCommand == "f" )
+   {
+      if( subCommand == params )
+         player.sendDebug( "Because reasons of filling chat with nonsense, please enter a search term" );
+      else
+      {
+         std::set< Core::Scripting::ScriptInfo* > scripts;
+         g_scriptMgr.getNativeScriptHandler().findScripts( scripts, params );
+
+         if( !scripts.empty() )
+         {
+            player.sendDebug( "Found " + std::to_string( scripts.size() ) + " scripts" );
+
+            for( auto it = scripts.begin(); it != scripts.end(); ++it )
+            {
+               auto script = *it;
+               player.sendDebug( " - '" + script->library_name + "' loaded at @ 0x" +
+                                 boost::str( boost::format( "%|X|" ) % script->handle ) +
+                                 ", num scripts: " + std::to_string( script->scripts.size() ) );
+            }
+         }
+         else
+            player.sendDebug( "No scripts found with search term: " + params );
+      }
+   }
+   else if( subCommand == "load" || subCommand == "l" )
+   {
+      if( subCommand == params )
+         player.sendDebug( "Command failed: requires relative path to script" );
+      else
+      {
+         if ( g_scriptMgr.getNativeScriptHandler().loadScript( params ) )
+            player.sendDebug( "Loaded '" + params + "' successfully" );
+         else
+            player.sendDebug( "Failed to load '" + params + "'" );
+      }
+
+   }
+   else if( subCommand == "queuereload" || subCommand == "qrl" )
+   {
+      if( subCommand == params )
+         player.sendDebug( "Command failed: requires name of script to reload" );
+      else
+      {
+         g_scriptMgr.getNativeScriptHandler().queueScriptReload( params );
+         player.sendDebug( "Queued script reload for script: " + params );
+      }
+   }
+   else if( subCommand == "build" || subCommand == "b" )
+   {
+      if( subCommand == params )
+         player.sendDebug( "Command failed: requires name of cmake target" );
+      else
+      {
+
+      }
+   }
+   else
+   {
+      player.sendDebug( "Unknown script subcommand: " + subCommand );
+   }
+}
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h
new file mode 100644
index 00000000..cc5570e5
--- /dev/null
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.h
@@ -0,0 +1,52 @@
+#ifndef _GAMECOMMANDHANDLER_H_
+#define _GAMECOMMANDHANDLER_H_
+
+#include <map>
+
+#include "DebugCommand.h"
+#include <common/Common.h>
+#include "Forwards.h"
+
+namespace Core {
+
+
+// handler for in game commands
+class DebugCommandHandler
+{
+private:
+   // container mapping command string to command object
+   std::map< std::string, boost::shared_ptr< DebugCommand > > m_commandMap;
+
+public:
+   DebugCommandHandler();
+   ~DebugCommandHandler();
+
+   // register command to command map
+   void registerCommand( const std::string& n, DebugCommand::pFunc, const std::string& hText, uint8_t uLevel );
+
+   // execute command if registered
+   void execCommand( char * data, Entity::Player& player );
+
+   // help command
+   void help( char* data, Entity::Player& player, boost::shared_ptr< DebugCommand > command );
+
+   // command handler callbacks
+   void set( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command );
+   void get( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command );
+   void add( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command );
+   //void debug( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command );
+
+   void injectPacket( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command );
+   void injectChatPacket( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command );
+   void replay( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command );
+   void nudge( char* data, Entity::Player& player, boost::shared_ptr< DebugCommand > command );
+   void serverInfo( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command );
+
+   void unlockCharacter( char* data, Entity::Player& player, boost::shared_ptr< DebugCommand > command );
+
+   void script( char* data, Entity::Player& player, boost::shared_ptr< DebugCommand > command );
+
+};
+
+}
+#endif
diff --git a/src/servers/sapphire_zone/Network/GameConnection.cpp b/src/servers/sapphire_zone/Network/GameConnection.cpp
index 66c21618..4d95a1c1 100644
--- a/src/servers/sapphire_zone/Network/GameConnection.cpp
+++ b/src/servers/sapphire_zone/Network/GameConnection.cpp
@@ -12,9 +12,11 @@
 #include "Session.h"
 #include "Zone/Zone.h"
 #include "Network/PacketWrappers/InitUIPacket.h"
+#include "DebugCommand/DebugCommandHandler.h"
 #include "Actor/Player.h"
 #include "Forwards.h"
 
+extern Core::DebugCommandHandler g_gameCommandMgr;
 extern Core::Logger g_log;
 extern Core::ServerZone g_serverZone;
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index 4c62c851..90c9140a 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -26,6 +26,7 @@
 #include "Network/PacketWrappers/EventFinishPacket.h"
 #include "Network/PacketWrappers/PlayerStateFlagsPacket.h"
 
+#include "DebugCommand/DebugCommandHandler.h"
 #include "Actor/Player.h"
 #include "Inventory/Inventory.h"
 #include "Forwards.h"
@@ -36,6 +37,7 @@
 extern Core::Logger g_log;
 extern Core::ServerZone g_serverZone;
 extern Core::Data::ExdData g_exdData;
+extern Core::DebugCommandHandler g_gameCommandMgr;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 453cfd2e..8ffbb655 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -27,19 +27,19 @@
 #include "Network/PacketWrappers/EventFinishPacket.h"
 #include "Network/PacketWrappers/PlayerStateFlagsPacket.h"
 
+#include "DebugCommand/DebugCommandHandler.h"
 #include "Actor/Player.h"
 #include "Inventory/Inventory.h"
 #include "Forwards.h"
 #include "Event/EventHelper.h"
 #include "Action/Action.h"
 #include "Action/ActionTeleport.h"
-#include "Script/ScriptManager.h"
 
 extern Core::Logger g_log;
 extern Core::ServerZone g_serverZone;
 extern Core::TerritoryMgr g_territoryMgr;
 extern Core::Data::ExdData g_exdData;
-extern Core::Scripting::ScriptManager g_scriptMgr;
+extern Core::DebugCommandHandler g_gameCommandMgr;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -127,15 +127,6 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       return;
    auto targetPlayer = targetActor->getAsPlayer();
 
-//   auto script = g_scriptMgr.getNativeScriptHandler().getScript< GmCommandScript >( commandId );
-//   if( script )
-//   {
-//      script->gm1Handler( param1, param2, param3 );
-//      return;
-//   }
-//
-//   player.sendUrgent( "GM1 Command not implemented: " + std::to_string( commandId ) );
-
    switch( commandId )
    {
    case GmCommand::Lv:
diff --git a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
index d219cb4c..752ca776 100644
--- a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
@@ -19,6 +19,7 @@
 #include "Network/PacketWrappers/ActorControlPacket143.h"
 #include "Network/PacketWrappers/ActorControlPacket144.h"
 
+#include "DebugCommand/DebugCommandHandler.h"
 #include "Actor/Player.h"
 #include "Inventory/Inventory.h"
 #include "Forwards.h"
@@ -26,6 +27,7 @@
 extern Core::Logger g_log;
 extern Core::ServerZone g_serverZone;
 extern Core::Data::ExdData g_exdData;
+extern Core::DebugCommandHandler g_gameCommandMgr;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index 3dd5d990..31495441 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -29,7 +29,7 @@
 #include "Network/PacketWrappers/EventFinishPacket.h"
 #include "Network/PacketWrappers/PlayerStateFlagsPacket.h"
 
-#include "Script/ScriptManager.h"
+#include "DebugCommand/DebugCommandHandler.h"
 #include "Actor/Player.h"
 #include "Inventory/Inventory.h"
 #include "Forwards.h"
@@ -42,7 +42,7 @@ extern Core::Logger g_log;
 extern Core::ServerZone g_serverZone;
 extern Core::TerritoryMgr g_territoryMgr;
 extern Core::Data::ExdData g_exdData;
-extern Core::Scripting::ScriptManager g_scriptMgr;
+extern Core::DebugCommandHandler g_gameCommandMgr;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -493,7 +493,7 @@ void Core::Network::GameConnection::chatHandler( const Packets::GamePacket& inPa
    if( chatString.at( 0 ) == '!' )
    {
       // execute game console command
-      g_scriptMgr.debugCommandHandler( chatString.substr( 1 ), player );
+      g_gameCommandMgr.execCommand( const_cast< char * >( chatString.c_str() ) + 1, player );
       return;
    }
 
@@ -516,7 +516,7 @@ void Core::Network::GameConnection::chatHandler( const Packets::GamePacket& inPa
    }
    case ChatType::Shout:
    {
-      player.getCurrentZone()->queueOutPacket( chatPacket );
+      player.getCurrentZone()->queueOutPacketForRange( player, 6000, chatPacket );
       break;
    }
    default:
diff --git a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
index bf542e1e..38b339c7 100644
--- a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
@@ -19,6 +19,8 @@
 
 #include "Network/PacketWrappers/PlayerStateFlagsPacket.h"
 
+#include "DebugCommand/DebugCommandHandler.h"
+
 #include "Actor/Player.h"
 
 #include "Forwards.h"
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h
index faeb1010..72c0fac6 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptApi.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h
@@ -1,19 +1,13 @@
 #ifndef NATIVE_SCRIPT_API
 #define NATIVE_SCRIPT_API
 
-#include "ScriptManager.h"
-
 #include <string>
 #include <typeinfo>
 #include <typeindex>
-#include <utility>
 
 #include <Actor/Actor.h>
 #include <Actor/Player.h>
 #include <StatusEffect/StatusEffect.h>
-#include <common/Logging/Logger.h>
-#include <ServerZone.h>
-#include <common/Exd/ExdData.h>
 
 #ifdef _MSC_VER
 #define EXPORT __declspec( dllexport )
@@ -27,28 +21,16 @@ using namespace Core;
 #define EVENTSCRIPT_AETHERYTE_ID 0x50000
 #define EVENTSCRIPT_AETHERNET_ID 0x50001
 
-class SapphireObjects
-{
-public:
-   SapphireObjects() = default;
-
-   Core::Logger* m_logger;
-   Core::ServerZone* m_zone;
-   Core::Scripting::ScriptManager* m_scriptMgr;
-   Core::Data::ExdData* m_exd;
-};
-
 class ScriptObject
 {
 protected:
    uint32_t m_id;
    std::size_t m_type;
-   SapphireObjects* m_objects;
 
 public:
-   ScriptObject( uint32_t id, const std::type_info& type ) :
+   ScriptObject( uint32_t id, std::size_t type ) :
       m_id( id ),
-      m_type( type.hash_code() )
+      m_type( type )
    { }
 
    virtual uint32_t getId() const
@@ -56,28 +38,18 @@ public:
       return m_id;
    }
 
-   virtual void setId( const uint32_t id )
-   {
-      m_id = id;
-   }
-
    virtual std::size_t getType() const
    {
       return m_type;
    }
-
-   virtual void setObjects( SapphireObjects* ptr )
-   {
-      m_objects = ptr;
-   }
 };
 
 
 class StatusEffectScript : public ScriptObject
 {
 public:
-   explicit StatusEffectScript( uint32_t effectId ) :
-      ScriptObject( effectId, typeid( StatusEffectScript ) )
+   StatusEffectScript( uint32_t effectId ) :
+      ScriptObject( effectId, typeid( StatusEffectScript ).hash_code() )
    { }
 
    virtual void onTick( Entity::Actor& actor ) { }
@@ -94,8 +66,8 @@ public:
 class ActionScript : public ScriptObject
 {
 public:
-   explicit ActionScript( uint32_t abilityId ) :
-      ScriptObject( abilityId, typeid( ActionScript ) )
+    ActionScript( uint32_t abilityId ) :
+      ScriptObject( abilityId, typeid( ActionScript ).hash_code() )
    { }
 
    virtual void onStart( Entity::Actor& sourceActor, Entity::Actor& targetActor ) { }
@@ -107,8 +79,8 @@ public:
 class EventScript : public ScriptObject
 {
 public:
-   explicit EventScript( uint32_t questId ) :
-      ScriptObject( questId, typeid( EventScript ) )
+   EventScript( uint32_t questId ) :
+      ScriptObject( questId, typeid( EventScript ).hash_code() )
    { }
 
    virtual void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) { }
@@ -125,63 +97,19 @@ public:
 class BattleNpcScript : public ScriptObject
 {
 public:
-   explicit BattleNpcScript( uint32_t npcId ) :
-      ScriptObject( npcId, typeid( BattleNpcScript ) )
+   BattleNpcScript( uint32_t npcId ) :
+      ScriptObject( npcId, typeid( BattleNpcScript ).hash_code() )
    { }
 };
 
 class ZoneScript : public ScriptObject
 {
 public:
-   explicit ZoneScript( uint32_t zoneId ) :
-      ScriptObject( zoneId, typeid( ZoneScript ) )
+   ZoneScript( uint32_t zoneId ) :
+      ScriptObject( zoneId, typeid( ZoneScript ).hash_code() )
    { }
 
    virtual void onZoneInit() { }
 };
 
-class GmCommandScript : public ScriptObject
-{
-public:
-   explicit GmCommandScript( uint32_t cmdId ) :
-      ScriptObject( cmdId, typeid( GmCommandScript ) )
-   { }
-
-   virtual void gm1Handler( uint32_t param1, uint32_t param2, uint32_t param3 ) { }
-   virtual void gm2Handler( const std::string& param1 ) { }
-};
-
-class DebugCommandScript : public ScriptObject
-{
-protected:
-   std::string m_cmd;
-   std::string m_helpText;
-   uint8_t m_gmLevel;
-
-public:
-   explicit DebugCommandScript( const std::string& cmd, const std::string& helpText, uint8_t gmLevel) :
-      ScriptObject( 0, typeid( DebugCommandScript ) ),
-      m_cmd( cmd ),
-      m_helpText( helpText ),
-      m_gmLevel( gmLevel )
-   { }
-
-   virtual const std::string& getCmd()
-   {
-      return m_cmd;
-   }
-
-   virtual const uint8_t getGmLevel()
-   {
-      return m_gmLevel;
-   }
-
-   virtual const std::string getHelpText()
-   {
-      return m_helpText;
-   }
-
-   virtual void run( Entity::Player& player, const std::string& args, const std::string& subCommand, const std::string& params ) { }
-};
-
 #endif
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/NativeScriptManager.cpp b/src/servers/sapphire_zone/Script/NativeScriptManager.cpp
index 17a76217..9b487c03 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptManager.cpp
+++ b/src/servers/sapphire_zone/Script/NativeScriptManager.cpp
@@ -1,30 +1,8 @@
-#include <ServerZone.h>
-#include <common/Exd/ExdData.h>
 #include "NativeScriptManager.h"
-#include "ScriptManager.h"
-
-extern Core::Scripting::ScriptManager g_scriptMgr;
-extern Core::Data::ExdData g_exdData;
-extern Core::Logger g_log;
-extern Core::ServerZone g_serverZone;
 
 namespace Core {
 namespace Scripting {
 
-   NativeScriptManager::NativeScriptManager() :
-      m_objects( new SapphireObjects )
-   {
-      m_objects->m_logger = &g_log;
-      m_objects->m_zone = &g_serverZone;
-      m_objects->m_scriptMgr = &g_scriptMgr;
-      m_objects->m_exd = &g_exdData;
-   }
-
-   NativeScriptManager::~NativeScriptManager()
-   {
-      delete m_objects;
-   }
-
    bool NativeScriptManager::loadScript( const std::string& path )
    {
       auto module = m_loader.loadModule( path );
@@ -49,11 +27,6 @@ namespace Scripting {
          auto script = scripts[i];
          module->scripts.push_back( script );
 
-         script->setObjects( m_objects );
-
-         if( script->getId() == 0 )
-            script->setId( m_allocatedScriptIds[script->getType()]++ );
-
          m_scripts[script->getType()][script->getId()] = script;
 
          success = true;
diff --git a/src/servers/sapphire_zone/Script/NativeScriptManager.h b/src/servers/sapphire_zone/Script/NativeScriptManager.h
index 01b8ec53..a793b68e 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptManager.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptManager.h
@@ -20,18 +20,15 @@ namespace Scripting {
    {
    protected:
       std::unordered_map< std::size_t, std::unordered_map< uint32_t, ScriptObject* > > m_scripts;
-      std::map< std::size_t, uint32_t > m_allocatedScriptIds;
 
       ScriptLoader m_loader;
-      SapphireObjects* m_objects;
 
       std::queue< std::string > m_scriptLoadQueue;
 
       bool unloadScript( ScriptInfo* info );
 
    public:
-      NativeScriptManager();
-      ~NativeScriptManager();
+      NativeScriptManager( ) = default;
 
       bool loadScript( const std::string& path );
       bool unloadScript( const std::string& name );
@@ -43,7 +40,7 @@ namespace Scripting {
       const std::string getModuleExtension();
       bool isModuleLoaded( const std::string& name );
 
-      template< class T >
+      template< typename T >
       T* getScript( uint32_t scriptId )
       {
          auto type = typeid( T ).hash_code();
@@ -54,14 +51,6 @@ namespace Scripting {
 
          return dynamic_cast< T* >( script->second );
       }
-
-      template< class T >
-      std::unordered_map< uint32_t, ScriptObject* >& getScriptsOfType()
-      {
-         auto type = typeid( T ).hash_code();
-
-         return m_scripts[type];
-      };
    };
 
 
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.cpp b/src/servers/sapphire_zone/Script/ScriptManager.cpp
index 268557ca..40eddee6 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptManager.cpp
@@ -20,6 +20,9 @@
 #include <boost/format.hpp>
 #include <boost/foreach.hpp>
 
+
+// enable the ambiguity fix for every platform to avoid #define nonsense
+#define WIN_AMBIGUITY_FIX
 #include <libraries/external/watchdog/Watchdog.h>
 
 extern Core::Logger g_log;
@@ -47,8 +50,7 @@ bool Core::Scripting::ScriptManager::init()
    std::set< std::string > files;
 
    loadDir( g_serverZone.getConfig()->getValue< std::string >( "Settings.General.Scripts.Path", "./compiledscripts/" ),
-            files,
-            m_nativeScriptManager->getModuleExtension() );
+            files, m_nativeScriptManager->getModuleExtension() );
 
    uint32_t scriptsFound = 0;
    uint32_t scriptsLoaded = 0;
@@ -63,7 +65,7 @@ bool Core::Scripting::ScriptManager::init()
          scriptsLoaded++;
    }
 
-   g_log.info( "ScriptManager: Loaded " + std::to_string( scriptsLoaded ) + "/" + std::to_string( scriptsFound ) + " modules successfully" );
+   g_log.info( "ScriptManager: Loaded " + std::to_string( scriptsLoaded ) + "/" + std::to_string( scriptsFound ) + " scripts successfully" );
 
    watchDirectories();
 
@@ -87,19 +89,17 @@ void Core::Scripting::ScriptManager::watchDirectories()
          return;
       }
 
-      for( const auto& path : paths )
+      for( auto path : paths )
       {
-         auto name = path.stem().string();
-
-         if( m_nativeScriptManager->isModuleLoaded( name ) )
+         if( m_nativeScriptManager->isModuleLoaded( path.stem().string() ) )
          {
-            g_log.debug( "Reloading changed script: " + name );
+            g_log.debug( "Reloading changed script: " + path.stem().string() );
 
-            m_nativeScriptManager->queueScriptReload( name );
+            m_nativeScriptManager->queueScriptReload( path.stem( ).string( ));
          }
          else
          {
-            g_log.debug( "Loading new script: " + name );
+            g_log.debug( "Loading new script: " + path.stem().string() );
 
             m_nativeScriptManager->loadScript( path.string() );
          }
@@ -110,7 +110,7 @@ void Core::Scripting::ScriptManager::watchDirectories()
 void Core::Scripting::ScriptManager::loadDir( const std::string& dirname, std::set<std::string> &files, const std::string& ext )
 {
 
-   g_log.info( "ScriptManager: loading scripts from " + dirname );
+   g_log.info( "ScriptEngine: loading scripts from " + dirname );
 
    boost::filesystem::path targetDir( dirname );
 
@@ -342,74 +342,6 @@ bool Core::Scripting::ScriptManager::onZoneInit( ZonePtr pZone )
    return false;
 }
 
-bool Core::Scripting::ScriptManager::gm1Handler( uint32_t cmdId, uint32_t param1, uint32_t param2, uint32_t param3 )
-{
-   auto script = m_nativeScriptManager->getScript< GmCommandScript >( cmdId );
-   if( script )
-   {
-      script->gm1Handler( param1, param2, param3 );
-      return true;
-   }
-
-   return false;
-}
-
-bool Core::Scripting::ScriptManager::gm2Handler( uint32_t cmdId, const std::string& param1 )
-{
-   auto script = m_nativeScriptManager->getScript< GmCommandScript >( cmdId );
-   if( script )
-   {
-      script->gm2Handler( param1 );
-      return true;
-   }
-
-   return false;
-}
-
-bool Core::Scripting::ScriptManager::debugCommandHandler( const std::string& cmd, Entity::Player& player )
-{
-   std::string command, params, subCommand;
-   auto cmdPos = cmd.find_first_of( ' ' );
-
-   if( cmdPos != std::string::npos )
-   {
-      command = cmd.substr( 0, cmdPos );
-      params = cmd.substr( cmdPos + 1 );
-
-      auto p = params.find_first_of( ' ' );
-
-      if( p != std::string::npos )
-      {
-         subCommand = params.substr( 0, p );
-         params = params.substr( subCommand.length() + 1 );
-      }
-      else
-         subCommand = params;
-   }
-   else
-      command = cmd;
-
-   g_log.debug( "[" + std::to_string( player.getId() ) + "] " +
-                "subCommand: " + subCommand + " params: " + params );
-
-   for( std::pair< uint32_t, ScriptObject* > pair : m_nativeScriptManager->getScriptsOfType< DebugCommandScript >() )
-   {
-      if( pair.second == nullptr )
-         continue;
-
-      auto script = dynamic_cast< DebugCommandScript* >( pair.second );
-
-      if( player.getGmRank() >= script->getGmLevel() && script->getCmd() == command )
-      {
-         script->run( player, cmd, subCommand, params );
-
-         return true;
-      }
-   }
-
-   return false;
-}
-
 Scripting::NativeScriptManager& Core::Scripting::ScriptManager::getNativeScriptHandler()
 {
    return *m_nativeScriptManager;
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.h b/src/servers/sapphire_zone/Script/ScriptManager.h
index 4a27ea7a..958412a0 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.h
+++ b/src/servers/sapphire_zone/Script/ScriptManager.h
@@ -59,10 +59,6 @@ namespace Core
          bool onEventHandlerReturn( Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param1, uint16_t param2, uint16_t param3 );
          bool onEventHandlerTradeReturn( Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param, uint32_t catalogId );
 
-         bool gm1Handler( uint32_t cmdId, uint32_t param1, uint32_t param2, uint32_t param3 );
-         bool gm2Handler( uint32_t cmdId, const std::string& param1 );
-
-         bool debugCommandHandler( const std::string& cmd, Entity::Player& player );
 
          void loadDir( const std::string& dirname, std::set<std::string> &files, const std::string& ext );
 
diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp
index bea551e3..712fa37d 100644
--- a/src/servers/sapphire_zone/ServerZone.cpp
+++ b/src/servers/sapphire_zone/ServerZone.cpp
@@ -24,7 +24,7 @@
 
 #include "Zone/TerritoryMgr.h"
 
-#include "Actor/Player.h"
+#include "DebugCommand/DebugCommandHandler.h"
 
 #include "Script/ScriptManager.h"
 #include "Linkshell/LinkshellMgr.h"
@@ -37,6 +37,7 @@
 #include <common/Util/Util.h>
 
 Core::Logger g_log;
+Core::DebugCommandHandler g_gameCommandMgr;
 Core::Scripting::ScriptManager g_scriptMgr;
 Core::Data::ExdData g_exdData;
 Core::Data::ExdDataGenerated g_exdDataGen;
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
index 488f1642..1c9c3b59 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
@@ -113,8 +113,7 @@ bool Core::TerritoryMgr::createDefaultTerritories()
                                         "\t" + std::to_string( guid ) +
                                         "\t" + std::to_string( territoryInfo->territoryIntendedUse ) +
                                         "\t" + territoryInfo->name +
-                                        ( territoryInfo->name.length() > 4 ? "\t" : "\t\t" ) +
-                                        pPlaceName->name );
+                                        "\t" + pPlaceName->name );
 
       ZonePtr pZone( new Zone( territoryId, guid, territoryInfo->name, pPlaceName->name, false ) );
       pZone->init();
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 9bda0d64..1b8cb402 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -362,19 +362,6 @@ void Zone::queueOutPacketForRange( Entity::Player& sourcePlayer, uint32_t range,
    }
 }
 
-void Zone::queueOutPacket( Network::Packets::GamePacketPtr pPacketEntry )
-{
-   for( auto it = m_playerMap.begin(); it != m_playerMap.end(); ++it )
-   {
-      auto pSession = g_serverZone.getSession( ( *it ).second->getId() );
-      if( pSession )
-      {
-         pPacketEntry->setValAt< uint32_t >( 0x08, ( *it ).second->getId() );
-         pSession->getZoneConnection()->queueOutPacket( pPacketEntry );
-      }
-   }
-}
-
 uint32_t Zone::getTerritoryId()
 {
    return m_territoryId;
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 2837b6ca..c2caa2e3 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -86,8 +86,6 @@ public:
 
    void queueOutPacketForRange( Entity::Player& sourcePlayer, uint32_t range, Network::Packets::GamePacketPtr pPacketEntry );
 
-   void queueOutPacket( Network::Packets::GamePacketPtr pPacketEntry );
-
    virtual uint32_t getTerritoryId();
 
    Common::RegionType getType() const;