sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Players): Fixed setting player's zone id to unknown value. (#10996)

Browse Source 
* fix(Core/Players): Fixed setting player's zone id to unknown value.

Fixed #10945

* Update.

* Update.
This commit is contained in:
UltraNix
2022-04-01 11:59:12 +02:00
committed by GitHub
parent 4521dcb5c5
commit 14edda6c90
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/PlayerUpdates.cpp
+5
View File
@@ -1192,6 +1192,11 @@ void Player::UpdateArea(uint32 newArea)
void Player::UpdateZone(uint32 newZone, uint32 newArea) void Player::UpdateZone(uint32 newZone, uint32 newArea)
{ {
if (!newZone)
{
return;
}
if (m_zoneUpdateId != newZone) if (m_zoneUpdateId != newZone)
{ {
sOutdoorPvPMgr->HandlePlayerLeaveZone(this, m_zoneUpdateId); sOutdoorPvPMgr->HandlePlayerLeaveZone(this, m_zoneUpdateId);
src/server/game/Spells/SpellInfo.cpp
+1 -1
View File
@@ -1499,7 +1499,7 @@ SpellCastResult SpellInfo::CheckLocation(uint32 map_id, uint32 zone_id, uint32 a
} }
// continent limitation (virtual continent) // continent limitation (virtual continent)
if (HasAttribute(SPELL_ATTR4_ONLY_FLYING_AREAS)) if (HasAttribute(SPELL_ATTR4_ONLY_FLYING_AREAS) && (area_id || zone_id))
{ {
AreaTableEntry const* areaEntry = sAreaTableStore.LookupEntry(area_id); AreaTableEntry const* areaEntry = sAreaTableStore.LookupEntry(area_id);
if (!areaEntry) if (!areaEntry)
src/server/scripts/Spells/spell_generic.cpp
+1 -1
View File
@@ -3827,7 +3827,7 @@ public:
AreaTableEntry const* area = sAreaTableStore.LookupEntry(target->GetAreaId()); AreaTableEntry const* area = sAreaTableStore.LookupEntry(target->GetAreaId());
// Xinef: add battlefield check // Xinef: add battlefield check
Battlefield* Bf = sBattlefieldMgr->GetBattlefieldToZoneId(target->GetZoneId()); Battlefield* Bf = sBattlefieldMgr->GetBattlefieldToZoneId(target->GetZoneId());
if (!area || (canFly && ((area->flags & AREA_FLAG_NO_FLY_ZONE) || (Bf && !Bf->CanFlyIn())))) if ((area && canFly && (area->flags & AREA_FLAG_NO_FLY_ZONE)) || (Bf && !Bf->CanFlyIn()))
canFly = false; canFly = false;
uint32 mount = 0; uint32 mount = 0;