diff --git a/sql/updates/8098_01_characters_character_action.sql b/sql/updates/8098_01_characters_character_action.sql index 1ae612ab1..eb5e7bb78 100644 --- a/sql/updates/8098_01_characters_character_action.sql +++ b/sql/updates/8098_01_characters_character_action.sql @@ -4,7 +4,7 @@ ALTER TABLE character_action CHANGE COLUMN action action int(11) unsigned NOT NULL default '0'; UPDATE character_action - SET action = action | ( misc < 16 ); + SET action = action | ( misc << 16 ); ALTER TABLE character_action DROP COLUMN misc; diff --git a/sql/updates/8098_02_mangos_playercreateinfo_action.sql b/sql/updates/8098_02_mangos_playercreateinfo_action.sql index f9bd79976..5a6f6f4f3 100644 --- a/sql/updates/8098_02_mangos_playercreateinfo_action.sql +++ b/sql/updates/8098_02_mangos_playercreateinfo_action.sql @@ -4,7 +4,7 @@ ALTER TABLE playercreateinfo_action CHANGE COLUMN action action int(11) unsigned NOT NULL default '0'; UPDATE playercreateinfo_action - SET action = action | ( misc < 16 ); + SET action = action | ( misc << 16 ); ALTER TABLE playercreateinfo_action DROP COLUMN misc; diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 1c5679390..c91c49e4f 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -5564,7 +5564,6 @@ ActionButton* Player::addActionButton(uint8 button, uint32 action, uint8 type) // set data and update to CHANGED if not NEW ab.SetActionAndType(action,ActionButtonType(type)); - } sLog.outDetail( "Player '%u' Added Action '%u' (type %u) to Button '%u'", GetGUIDLow(), action, uint32(type), button ); return &ab; @@ -20481,5 +20480,4 @@ void Player::SendDuelCountdown(uint32 counter) { WorldPacket data(SMSG_DUEL_COUNTDOWN, 4); data << uint32(counter); // seconds - GetSession()->SendPacket(&data); -} + GetSession()->SendPacket(&data); \ No newline at end of file diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8d1dc83e8..d8c5088ea 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8106" + #define REVISION_NR "8107" #endif // __REVISION_NR_H__