diff options
| -rw-r--r-- | src/server/scripts/Commands/cs_instance.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_misc.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/scripts/Commands/cs_instance.cpp b/src/server/scripts/Commands/cs_instance.cpp index d2cec87e08f..0bc352be842 100644 --- a/src/server/scripts/Commands/cs_instance.cpp +++ b/src/server/scripts/Commands/cs_instance.cpp @@ -308,6 +308,8 @@ public: return false; } + encounterId = atoi(param1); + if (encounterId > map->ToInstanceMap()->GetInstanceScript()->GetEncounterCount()) { handler->PSendSysMessage(LANG_BAD_VALUE); @@ -315,8 +317,6 @@ public: return false; } - encounterId = atoi(param1); - uint8 state = map->ToInstanceMap()->GetInstanceScript()->GetBossState(encounterId); handler->PSendSysMessage(LANG_COMMAND_INST_GET_BOSS_STATE, encounterId, state); return true; diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 706f98c0009..c34e32b134f 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1964,12 +1964,12 @@ public: // we have to manually set the string for mutedate time_t sqlTime = fields[0].GetUInt32(); - struct tm* timeinfo; + tm timeinfo; char buffer[80]; // set it to string - timeinfo = localtime_r(&sqlTime); - strftime(buffer, sizeof(buffer),"%Y-%m-%d %I:%M%p", timeinfo); + localtime_r(&sqlTime, &timeinfo); + strftime(buffer, sizeof(buffer),"%Y-%m-%d %I:%M%p", &timeinfo); handler->PSendSysMessage(LANG_COMMAND_MUTEHISTORY_OUTPUT, buffer, fields[1].GetUInt32(), fields[2].GetCString(), fields[3].GetCString()); } while (result->NextRow()); |