diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake index 9b2c849ec39..ea4820a01f0 100644 --- a/cmake/showoptions.cmake +++ b/cmake/showoptions.cmake @@ -62,14 +62,6 @@ else() message("* Use coreside debug : No (default)") endif() -if( WIN32 ) - if( USE_MYSQL_SOURCES ) - message("* Use MySQL sourcetree : Yes (default)") - else() - message("* Use MySQL sourcetree : No") - endif() -endif( WIN32 ) - if ( WITHOUT_GIT ) message("* Use GIT revision hash : No") message("") diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 48ed1d635aa..0e0c9817b8b 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -23086,11 +23086,7 @@ bool Player::IsVisibleGloballyFor(Player const* u) const return GetSession()->GetSecurity() <= u->GetSession()->GetSecurity(); // non faction visibility non-breakable for non-GMs - if (!IsVisible()) - return false; - - // non-gm stealth/invisibility not hide from global player lists - return true; + return false; } template diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp index 948fee5a115..3f3040c3c81 100644 --- a/src/server/scripts/Commands/cs_guild.cpp +++ b/src/server/scripts/Commands/cs_guild.cpp @@ -280,7 +280,8 @@ public: // Format creation date char createdDateStr[20]; time_t createdDate = guild->GetCreatedDate(); - strftime(createdDateStr, 20, "%Y-%m-%d %H:%M:%S", localtime(&createdDate)); + tm localTm; + strftime(createdDateStr, 20, "%Y-%m-%d %H:%M:%S", localtime_r(&createdDate, &localTm)); handler->PSendSysMessage(LANG_GUILD_INFO_CREATION_DATE, createdDateStr); // Creation Date handler->PSendSysMessage(LANG_GUILD_INFO_MEMBER_COUNT, guild->GetMemberCount()); // Number of Members