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

fix(Core/Pets): do not summon pet if owner is being teleported (#7275)

Browse Source 
- Closes #7159
This commit is contained in:
UltraNix
2021-08-13 12:02:21 +02:00
committed by GitHub
parent da1fd680f3
commit 435761b284
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Handlers/PetHandler.cpp
+4 -3
View File
@@ -88,8 +88,11 @@ uint8 WorldSession::HandleLoadPetFromDBFirstCallback(PreparedQueryResult result,
if (!result) if (!result)
return PET_LOAD_NO_RESULT; return PET_LOAD_NO_RESULT;
if (!GetPlayer() || GetPlayer()->GetPet() || GetPlayer()->GetVehicle() || GetPlayer()->IsSpectator()) Player* owner = GetPlayer();
if (!owner || owner->GetPet() || owner->GetVehicle() || owner->IsSpectator() || owner->IsBeingTeleportedFar())
{
return PET_LOAD_ERROR; return PET_LOAD_ERROR;
}
Field* fields = result->Fetch(); Field* fields = result->Fetch();
@@ -97,8 +100,6 @@ uint8 WorldSession::HandleLoadPetFromDBFirstCallback(PreparedQueryResult result,
if (!fields) if (!fields)
return PET_LOAD_ERROR; return PET_LOAD_ERROR;
Player* owner = GetPlayer();
// update for case of current pet "slot = 0" // update for case of current pet "slot = 0"
uint32 petentry = fields[1].GetUInt32(); uint32 petentry = fields[1].GetUInt32();
if (!petentry) if (!petentry)