Core/Units: Sync ProcessTerrainStatusUpdate code with master branch
This commit is contained in:
1 parent
0eaea1109e
commit
8acf90d115
5 files changed
+21
-49
No files matched your search
@@ -3176,30 +3176,29 @@ bool Unit::IsUnderWater() const
|
||||
|
||||
void Unit::ProcessPositionDataChanged(PositionFullTerrainStatus const& data)
|
||||
{
|
||||
ZLiquidStatus oldLiquidStats = m_liquidStatus;
|
||||
|
||||
ZLiquidStatus oldLiquidStatus = GetLiquidStatus();
|
||||
WorldObject::ProcessPositionDataChanged(data);
|
||||
ProcessTerrainStatusUpdate(data.liquidStatus, data.liquidInfo);
|
||||
ProcessTerrainStatusUpdate(oldLiquidStatus, data.liquidInfo);
|
||||
|
||||
if (oldLiquidStats != m_liquidStatus)
|
||||
if (oldLiquidStatus != GetLiquidStatus())
|
||||
UpdateMountCapability();
|
||||
}
|
||||
|
||||
void Unit::ProcessTerrainStatusUpdate(ZLiquidStatus status, Optional<LiquidData> const& liquidData)
|
||||
void Unit::ProcessTerrainStatusUpdate(ZLiquidStatus /*oldLiquidStatus*/, Optional<LiquidData> const& newLiquidData)
|
||||
{
|
||||
if (!IsControlledByPlayer())
|
||||
return;
|
||||
|
||||
// remove appropriate auras if we are swimming/not swimming respectively
|
||||
if (status & MAP_LIQUID_STATUS_SWIMMING)
|
||||
if (IsInWater())
|
||||
RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags::UnderWater);
|
||||
else
|
||||
RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags::AboveWater);
|
||||
|
||||
// liquid aura handling
|
||||
LiquidTypeEntry const* curLiquid = nullptr;
|
||||
if ((status & MAP_LIQUID_STATUS_SWIMMING) && liquidData)
|
||||
curLiquid = sLiquidTypeStore.LookupEntry(liquidData->entry);
|
||||
if (IsInWater() && newLiquidData)
|
||||
curLiquid = sLiquidTypeStore.LookupEntry(newLiquidData->entry);
|
||||
if (curLiquid != _lastLiquid)
|
||||
{
|
||||
if (_lastLiquid && _lastLiquid->SpellID)
|
||||
|
||||
Reference in new issue
Block a user