diff options
| author | Gildor <gildor55@gmail.com> | 2021-06-20 12:08:12 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-11 11:33:37 +0100 |
| commit | 7d01ad8b8f7d20769058c642e690847aa51196c6 (patch) | |
| tree | 8f3313f22b621a14db8cc283c7d3e129d83c6c63 | |
| parent | 6e182ebe0586f916a67e66a1416e01fe2f01a19e (diff) | |
Scripts/Commands: Minor improvements in .pinfo and .unban character commands (#26586)
* Scripts/Commands: Minor improvements in .pinfo and .unban character commands
(cherry picked from commit 5446209b89146fdbe01627e806f7beddd6ae5de8)
| -rw-r--r-- | sql/updates/world/master/2022_03_11_01_world_2021_06_20_00_world.sql | 4 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/Language.h | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_ban.cpp | 1 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_misc.cpp | 11 |
4 files changed, 13 insertions, 5 deletions
diff --git a/sql/updates/world/master/2022_03_11_01_world_2021_06_20_00_world.sql b/sql/updates/world/master/2022_03_11_01_world_2021_06_20_00_world.sql new file mode 100644 index 00000000000..2912520ccd1 --- /dev/null +++ b/sql/updates/world/master/2022_03_11_01_world_2021_06_20_00_world.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `trinity_string` WHERE `entry`=883; +INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES +(883, 'Account'); diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index f493ab718d7..0a55efb3bf9 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -826,7 +826,7 @@ enum TrinityStrings LANG_ACCOUNT_SEC_TYPE = 880, LANG_RBAC_EMAIL_REQUIRED = 881, // = 882, LANG_PINFO_CHR_MAP_WITH_AREA - LANG_ACCOUNT = 883, // 3.3.5 RESERVED + LANG_ACCOUNT = 883, // Room for in-game strings 884-999 not used // Level 4 (CLI only commands) diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index da14c9a1bcd..053c3fc9933 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -701,6 +701,7 @@ public: return false; } + handler->PSendSysMessage(LANG_UNBAN_UNBANNED, name.c_str()); return true; } diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 9403fa8d178..a579062e8a9 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -1713,13 +1713,16 @@ public: stmt->setUInt64(0, lowguid); result2 = CharacterDatabase.Query(stmt); } + else + banType = handler->GetTrinityString(LANG_ACCOUNT); if (result2) { - Field* fields = result2->Fetch(); - banTime = int64(fields[1].GetUInt64() ? 0 : fields[0].GetUInt32()); - bannedBy = fields[2].GetString(); - banReason = fields[3].GetString(); + Field* fields = result2->Fetch(); + bool permanent = fields[1].GetUInt64() != 0; + banTime = !permanent ? int64(fields[0].GetUInt32()) : 0; + bannedBy = fields[2].GetString(); + banReason = fields[3].GetString(); } // Can be used to query data from Characters database |