mirror of
https://github.com/araxiaonline/mod-guildhouse.git
synced 2026-06-13 02:52:21 -04:00
18 lines
967 B
Diff
18 lines
967 B
Diff
diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h
|
|
index 0d779cd7..4d0d0594 100644
|
|
--- a/src/server/game/Entities/Object/Object.h
|
|
+++ b/src/server/game/Entities/Object/Object.h
|
|
@@ -796,7 +796,11 @@ class WorldObject : public Object, public WorldLocation
|
|
virtual void SetPhaseMask(uint32 newPhaseMask, bool update);
|
|
uint32 GetPhaseMask() const { return m_phaseMask; }
|
|
bool InSamePhase(WorldObject const* obj) const { return InSamePhase(obj->GetPhaseMask()); }
|
|
- bool InSamePhase(uint32 phasemask) const { return (GetPhaseMask() & phasemask); }
|
|
+ bool InSamePhase(uint32 phasemask) const {
|
|
+ if (GetZoneId() == 876)
|
|
+ return GetPhaseMask() == phasemask;
|
|
+ return (GetPhaseMask() & phasemask) != 0;
|
|
+ }
|
|
|
|
virtual uint32 GetZoneId(bool forceRecalc = false) const;
|
|
virtual uint32 GetAreaId(bool forceRecalc = false) const;
|