diff options
| -rw-r--r-- | sql/updates/world/2013_07_14_01_world_item_template.sql | 14 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 |
3 files changed, 18 insertions, 4 deletions
diff --git a/sql/updates/world/2013_07_14_01_world_item_template.sql b/sql/updates/world/2013_07_14_01_world_item_template.sql new file mode 100644 index 00000000000..ab372605f4b --- /dev/null +++ b/sql/updates/world/2013_07_14_01_world_item_template.sql @@ -0,0 +1,14 @@ +UPDATE `item_template` SET `Flags`=0x80000000 WHERE `entry`=23614; +UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=28635; +UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=28636; +UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=28637; +UPDATE `item_template` SET `Flags`=0x80000000 WHERE `entry`=30503; +UPDATE `item_template` SET `Flags`=0x80000000 WHERE `entry`=34868; +UPDATE `item_template` SET `Flags`=0x80000000 WHERE `entry`=37020; +UPDATE `item_template` SET `Flags`=0x80010000 WHERE `entry`=37200; +UPDATE `item_template` SET `Flags`=0x80000040 WHERE `entry`=40652; +UPDATE `item_template` SET `Flags`=0x80000040 WHERE `entry`=40970; +UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=41843; +UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=42782; + +ALTER TABLE `item_template` CHANGE `Flags` `Flags` int(10) unsigned NOT NULL DEFAULT '0'; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 77eb9152daa..42d50e5a00b 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -22642,10 +22642,10 @@ bool Player::IsAlwaysDetectableFor(WorldObject const* seer) const if (const Player* seerPlayer = seer->ToPlayer()) if (IsGroupVisibleFor(seerPlayer)) - return true; + return !(seerPlayer->duel && seerPlayer->duel->startTime != 0 && seerPlayer->duel->opponent == this); - return false; - } + return false; +} bool Player::IsVisibleGloballyFor(Player const* u) const { diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 949f3b61dd0..504c7f86654 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2542,7 +2542,7 @@ void ObjectMgr::LoadItemTemplates() itemTemplate.Name1 = fields[4].GetString(); itemTemplate.DisplayInfoID = fields[5].GetUInt32(); itemTemplate.Quality = uint32(fields[6].GetUInt8()); - itemTemplate.Flags = uint32(fields[7].GetInt64()); + itemTemplate.Flags = uint32(fields[7].GetUInt32()); itemTemplate.Flags2 = fields[8].GetUInt32(); itemTemplate.Unk430_1 = fields[9].GetFloat(); itemTemplate.Unk430_2 = fields[10].GetFloat(); |