aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/base/auth_database.sql3
-rw-r--r--sql/updates/auth/master/2017_12_17_00_auth.sql1
-rw-r--r--src/server/scripts/Commands/cs_misc.cpp4
3 files changed, 5 insertions, 3 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 17306109b75..c20fdebb093 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1227,6 +1227,7 @@ INSERT INTO `rbac_linked_permissions` VALUES
(197,486),
(197,487),
(197,494),
+(197,501),
(197,506),
(197,509),
(197,510),
@@ -1406,7 +1407,6 @@ INSERT INTO `rbac_linked_permissions` VALUES
(199,225),
(199,263),
(199,496),
-(199,501),
(199,507),
(199,525),
(199,534),
@@ -2329,6 +2329,7 @@ INSERT INTO `updates` VALUES
('2017_09_22_00_auth.sql','9313CCE80A18212E6F0C78D83316DE8582AE8084','ARCHIVED','2017-09-22 18:05:17',0),
('2017_10_13_00_auth.sql','87674E0D166AC60E3725B445714427892E42C6FE','ARCHIVED','2017-10-13 00:00:00',0),
('2017_11_11_01_auth.sql','0D6EDB6B2FC8B9FBDF11ECD79B4B8E943328B6A9','ARCHIVED','2017-11-11 18:49:45',0),
+('2017_12_17_00_auth.sql','2CD99730D4D32DBF0584CD5B1AA6F8F4AE3DA975','RELEASED','2017-12-17 00:00:00',0),
('2017_12_30_00_auth.sql','F360E9555AC68E28834E3FF807E4E37A090EF363','ARCHIVED','2017-12-30 00:23:32',0),
('2017_12_30_01_auth.sql','1E11C78BA6D1D8E8CED7423DF92D1D197D6061EE','ARCHIVED','2017-12-30 23:00:00',0),
('2017_12_31_00_auth.sql','1721ACBD35EB95FAE33B9E95F8C4E4B1FB70A5E4','ARCHIVED','2017-12-31 20:15:23',0),
diff --git a/sql/updates/auth/master/2017_12_17_00_auth.sql b/sql/updates/auth/master/2017_12_17_00_auth.sql
new file mode 100644
index 00000000000..89f3a0bc619
--- /dev/null
+++ b/sql/updates/auth/master/2017_12_17_00_auth.sql
@@ -0,0 +1 @@
+UPDATE `rbac_linked_permissions` SET `id` = 197 WHERE `linkedId` = 501;
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 24508556447..81f8e7ab7b9 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -681,7 +681,7 @@ public:
static bool HandleDismountCommand(ChatHandler* handler, char const* /*args*/)
{
- Player* player = handler->GetSession()->GetPlayer();
+ Player* player = handler->getSelectedPlayerOrSelf();
// If player is not mounted, so go out :)
if (!player->IsMounted())
@@ -693,7 +693,7 @@ public:
if (player->IsInFlight())
{
- handler->SendSysMessage(LANG_YOU_IN_FLIGHT);
+ handler->SendSysMessage(LANG_CHAR_IN_FLIGHT);
handler->SetSentErrorMessage(true);
return false;
}