nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-01 10:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'azerothcore:master' into Playerbot

Browse Source
This commit is contained in:
ZhengPeiRu21
2022-04-04 07:53:51 -06:00
committed by GitHub
parent a25c289a5a 446546fb96
commit 68d3ec7d77
35 changed files with 8418 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -2013,18 +2013,6 @@ void Creature::DespawnOnEvade()
{
SetVisible(false);
AI()->SummonedCreatureDespawnAll();
RemoveEvadeAuras();
float x, y, z, o;
GetRespawnPosition(x, y, z, &o);
SetHomePosition(x, y, z, o);
SetPosition(x, y, z, o);
if (IsFalling())
{
RemoveUnitMovementFlag(MOVEMENTFLAG_FALLING);
}
StopMoving();
}
void Creature::RespawnOnEvade()

4
src/server/game/Entities/Object/Object.cpp
View File

@@ -2272,8 +2272,8 @@ void WorldObject::SetZoneScript()
{
if (Map* map = FindMap())
{
if (map->IsDungeon())
m_zoneScript = (ZoneScript*)map->ToInstanceMap()->GetInstanceScript();
if (InstanceMap* instanceMap = map->ToInstanceMap())
m_zoneScript = reinterpret_cast<ZoneScript*>(instanceMap->GetInstanceScript());
else if (!map->IsBattlegroundOrArena())
{
uint32 zoneId = GetZoneId();