diff options
author | Shauren <shauren.trinity@gmail.com> | 2012-03-07 18:57:47 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2012-03-07 18:57:47 +0100 |
commit | a1a7a2d7c06e9a8d1cbf3a8901d8d134dcd1ee6a (patch) | |
tree | 13faefd56d6d21732b93a4c0c9595c59026d92f4 /src/server/collision/Management/VMapManager2.cpp | |
parent | 2e58d7b515a74944f4c4caca9fa29186e8f56586 (diff) |
Core/Players
* Add liquid special aura only if player is in it (not when above)
* Use CastSpell instead of AddAura - checks all dbc conditions on spell
Diffstat (limited to 'src/server/collision/Management/VMapManager2.cpp')
-rw-r--r-- | src/server/collision/Management/VMapManager2.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index 6139a27fb52..b9f0f25c2f9 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -30,6 +30,7 @@ #include <ace/Null_Mutex.h> #include <ace/Singleton.h> #include "DisableMgr.h" +#include "DBCStores.h" using G3D::Vector3; @@ -234,7 +235,7 @@ namespace VMAP floor = info.ground_Z; ASSERT(floor < std::numeric_limits<float>::max()); type = info.hitModel->GetLiquidType(); // entry from LiquidType.dbc - if (reqLiquidType && !(type & reqLiquidType)) + if (reqLiquidType && !(GetLiquidFlags(type) & reqLiquidType)) return false; if (info.hitInstance->GetLiquidLevel(pos, info, level)) return true; |