Merge remote-tracking branch 'upstream/development' into repacker

coolzoom · Apr 30, 2024 · d21226d · d21226d
2 parents c4809a5 + 657d4f5
commit d21226d
Show file tree

Hide file tree

Showing 9 changed files with 287 additions and 14 deletions.
diff --git a/sql/migrations/20240430043145_world.sql b/sql/migrations/20240430043145_world.sql
diff --git a/src/game/Objects/Player.cpp b/src/game/Objects/Player.cpp
@@ -6504,7 +6504,7 @@ bool Player::SetPosition(float x, float y, float z, float orientation, bool tele
     float const old_z = GetPositionZ();
     float const old_r = GetOrientation();
     bool const positionChanged = teleport || old_x != x || old_y != y || old_z != z;
-    bool const hasMovingFlags = m_movementInfo.HasMovementFlag(MOVEFLAG_MASK_MOVING);
+    bool const hasMovingFlags = m_movementInfo.HasMovementFlag(MOVEFLAG_MASK_XZ);
 
     if (positionChanged || hasMovingFlags || old_r != orientation)
     {

diff --git a/src/mangosd/CliRunnable.cpp b/src/mangosd/CliRunnable.cpp
@@ -124,5 +124,8 @@ void CliRunnable::operator()()
                 sWorld.QueueCliCommand(new CliCommandHolder(0, SEC_CONSOLE, nullptr, command.c_str(), &utf8print, &commandFinished));
             }
         }
+        #ifndef WIN32
+        free(command_str);
+        #endif
     }
 }
diff --git a/src/mangosd/Main.cpp b/src/mangosd/Main.cpp
@@ -216,7 +216,7 @@ extern int main(int argc, char **argv)
 
     // and run the 'Master'
     // TODO: Why do we need this 'Master'? Can't all of this be in the Main as for Realmd?
-    return sMaster.Run();
+    return sMaster.Run(serviceDaemonMode);
 
     // at sMaster return function exist with codes
     // 0 - normal shutdown

diff --git a/src/mangosd/Master.cpp b/src/mangosd/Master.cpp
@@ -153,7 +153,7 @@ Master::~Master()
 }
 
 // Main function
-int Master::Run()
+int Master::Run(char serviceDaemonMode = '\0')
 {
     // worldd PID file creation
     std::string pidfile = sConfig.GetStringDefault("PidFile", "");
@@ -210,7 +210,7 @@ int Master::Run()
 #ifdef WIN32
     if (sConfig.GetBoolDefault("Console.Enable", true) && (m_ServiceStatus == -1)/* need disable console in service mode*/)
 #else
-    if (sConfig.GetBoolDefault("Console.Enable", true))
+    if (sConfig.GetBoolDefault("Console.Enable", true) && !serviceDaemonMode)
 #endif
     {
         // Launch CliRunnable thread

diff --git a/src/mangosd/Master.h b/src/mangosd/Master.h
@@ -35,7 +35,7 @@ class Master
     public:
         Master();
         ~Master();
-        int Run();
+        int Run(char serviceDaemonMode);
         static volatile uint32  m_masterLoopCounter;
         static volatile bool    m_handleSigvSignals;
         static void SigvSignalHandler();

diff --git a/src/scripts/eastern_kingdoms/westfall/deadmines/deadmines.h b/src/scripts/eastern_kingdoms/westfall/deadmines/deadmines.h
@@ -17,8 +17,8 @@ enum
 
     /** Doors which need to be opened automatically once the boss before died */
     GO_DOOR1                = 13965,
-    GO_DOOR2                = 17153,
-    GO_DOOR3                = 26182,
+    GO_DOOR2                = 16400,
+    GO_DOOR3                = 16399,
 
     GUN_POWDER_EVENT        = 5000,
 

diff --git a/src/scripts/eastern_kingdoms/westfall/deadmines/instance_deadmines.cpp b/src/scripts/eastern_kingdoms/westfall/deadmines/instance_deadmines.cpp
@@ -139,7 +139,7 @@ struct instance_deadmines : public ScriptedInstance
             m_uiDoor1GUID = pGo->GetGUID();
         if (pGo->GetEntry() == GO_DOOR2 && pGo->GetPositionX() > -291.0f && pGo->GetPositionX() < -290.0f)
             m_uiDoor2GUID = pGo->GetGUID();
-        if (pGo->GetEntry() == GO_DOOR2 && pGo->GetPositionX() > -169.0f && pGo->GetPositionX() < -168.0f)
+        if (pGo->GetEntry() == GO_DOOR3 && pGo->GetPositionX() > -169.0f && pGo->GetPositionX() < -168.0f)
             m_uiDoor3GUID = pGo->GetGUID();
 
         if (pGo->GetEntry() == GO_DMF_CHEST)

diff --git a/src/shared/PosixDaemon.cpp b/src/shared/PosixDaemon.cpp
@@ -84,15 +84,9 @@ void startDaemon(uint32_t timeout)
         exit(EXIT_FAILURE);
     }
 
-    if ((chdir("/")) < 0)
-    {
-        exit(EXIT_FAILURE);
-    }
-
     close(STDIN_FILENO);
     close(STDOUT_FILENO);
     close(STDERR_FILENO);
-
 }
 
 void stopDaemon()