diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
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(); |