josh/ThordekkCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pet Battles: Teleport player behind pet at battle start

Browse Source 
PlayerPositions in SMSG_PET_BATTLE_FINALIZE_LOCATION does not move the
player character. Use NearTeleportTo to explicitly position the player
5 units behind the midpoint along the facing axis.
This commit is contained in:
luis
2026-03-12 08:38:20 -03:00
parent 05828b9eac
commit 1029149df0
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Handlers/BattlePetHandler.cpp
+25 -18
View File
@@ -509,25 +509,27 @@ void WorldSession::HandlePetBattleRequestWild(WorldPackets::BattlePet::PetBattle
creature->SetUnitFlag(UNIT_FLAG_PACIFIED); creature->SetUnitFlag(UNIT_FLAG_PACIFIED);
creature->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE); creature->SetUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
creature->GetMotionMaster()->MoveIdle(); creature->GetMotionMaster()->MoveIdle();
player->SetFacingToObject(creature);
// Send finalize location with OK result // Calculate battle scene positions
// BattleOrigin = midpoint; PlayerPositions pushed 5 units from center along facing axis
// so the player character stands behind their pet (matching retail sniff)
static constexpr float PET_BATTLE_PLAYER_DISTANCE = 5.0f; static constexpr float PET_BATTLE_PLAYER_DISTANCE = 5.0f;
WorldPackets::BattlePet::PetBattleFinalizeLocation finalizeLocation;
finalizeLocation.Location.LocationResult = PetBattles::PET_BATTLE_REQUEST_FAIL_OK;
Position midpoint; Position midpoint;
midpoint.m_positionX = (player->GetPositionX() + creature->GetPositionX()) / 2.0f; midpoint.m_positionX = (player->GetPositionX() + creature->GetPositionX()) / 2.0f;
midpoint.m_positionY = (player->GetPositionY() + creature->GetPositionY()) / 2.0f; midpoint.m_positionY = (player->GetPositionY() + creature->GetPositionY()) / 2.0f;
midpoint.m_positionZ = (player->GetPositionZ() + creature->GetPositionZ()) / 2.0f; midpoint.m_positionZ = (player->GetPositionZ() + creature->GetPositionZ()) / 2.0f;
float facing = player->GetAbsoluteAngle(creature); float facing = player->GetAbsoluteAngle(creature);
// Teleport the player behind their pet (5 units back from midpoint along facing axis)
Position playerPos(midpoint.m_positionX - PET_BATTLE_PLAYER_DISTANCE * std::cos(facing),
midpoint.m_positionY - PET_BATTLE_PLAYER_DISTANCE * std::sin(facing),
player->GetPositionZ(), facing);
player->NearTeleportTo(playerPos);
// Send finalize location with OK result
WorldPackets::BattlePet::PetBattleFinalizeLocation finalizeLocation;
finalizeLocation.Location.LocationResult = PetBattles::PET_BATTLE_REQUEST_FAIL_OK;
finalizeLocation.Location.BattleOrigin = midpoint; finalizeLocation.Location.BattleOrigin = midpoint;
finalizeLocation.Location.BattleFacing = facing; finalizeLocation.Location.BattleFacing = facing;
// Push players back from center so they stand behind their pets finalizeLocation.Location.PlayerPositions[0] = playerPos;
finalizeLocation.Location.PlayerPositions[0] = Position(midpoint.m_positionX - PET_BATTLE_PLAYER_DISTANCE * std::cos(facing),
midpoint.m_positionY - PET_BATTLE_PLAYER_DISTANCE * std::sin(facing),
player->GetPositionZ());
finalizeLocation.Location.PlayerPositions[1] = Position(midpoint.m_positionX + PET_BATTLE_PLAYER_DISTANCE * std::cos(facing), finalizeLocation.Location.PlayerPositions[1] = Position(midpoint.m_positionX + PET_BATTLE_PLAYER_DISTANCE * std::cos(facing),
midpoint.m_positionY + PET_BATTLE_PLAYER_DISTANCE * std::sin(facing), midpoint.m_positionY + PET_BATTLE_PLAYER_DISTANCE * std::sin(facing),
creature->GetPositionZ()); creature->GetPositionZ());
@@ -677,24 +679,29 @@ void WorldSession::StartNPCPetBattle(Creature* trainer)
return; return;
} }
// Stop NPC movement during battle and face player toward trainer // Stop NPC movement during battle
trainer->GetMotionMaster()->MoveIdle(); trainer->GetMotionMaster()->MoveIdle();
player->SetFacingToObject(trainer);
// Send finalize location with OK result // Calculate battle scene positions
static constexpr float PET_BATTLE_PLAYER_DISTANCE = 5.0f; static constexpr float PET_BATTLE_PLAYER_DISTANCE = 5.0f;
WorldPackets::BattlePet::PetBattleFinalizeLocation finalizeLocation;
finalizeLocation.Location.LocationResult = PetBattles::PET_BATTLE_REQUEST_FAIL_OK;
Position midpoint; Position midpoint;
midpoint.m_positionX = (player->GetPositionX() + trainer->GetPositionX()) / 2.0f; midpoint.m_positionX = (player->GetPositionX() + trainer->GetPositionX()) / 2.0f;
midpoint.m_positionY = (player->GetPositionY() + trainer->GetPositionY()) / 2.0f; midpoint.m_positionY = (player->GetPositionY() + trainer->GetPositionY()) / 2.0f;
midpoint.m_positionZ = (player->GetPositionZ() + trainer->GetPositionZ()) / 2.0f; midpoint.m_positionZ = (player->GetPositionZ() + trainer->GetPositionZ()) / 2.0f;
float facing = player->GetAbsoluteAngle(trainer); float facing = player->GetAbsoluteAngle(trainer);
// Teleport the player behind their pet
Position playerPos(midpoint.m_positionX - PET_BATTLE_PLAYER_DISTANCE * std::cos(facing),
midpoint.m_positionY - PET_BATTLE_PLAYER_DISTANCE * std::sin(facing),
player->GetPositionZ(), facing);
player->NearTeleportTo(playerPos);
// Send finalize location with OK result
WorldPackets::BattlePet::PetBattleFinalizeLocation finalizeLocation;
finalizeLocation.Location.LocationResult = PetBattles::PET_BATTLE_REQUEST_FAIL_OK;
finalizeLocation.Location.BattleOrigin = midpoint; finalizeLocation.Location.BattleOrigin = midpoint;
finalizeLocation.Location.BattleFacing = facing; finalizeLocation.Location.BattleFacing = facing;
finalizeLocation.Location.PlayerPositions[0] = Position(midpoint.m_positionX - PET_BATTLE_PLAYER_DISTANCE * std::cos(facing), finalizeLocation.Location.PlayerPositions[0] = playerPos;
midpoint.m_positionY - PET_BATTLE_PLAYER_DISTANCE * std::sin(facing),
player->GetPositionZ());
finalizeLocation.Location.PlayerPositions[1] = Position(midpoint.m_positionX + PET_BATTLE_PLAYER_DISTANCE * std::cos(facing), finalizeLocation.Location.PlayerPositions[1] = Position(midpoint.m_positionX + PET_BATTLE_PLAYER_DISTANCE * std::cos(facing),
midpoint.m_positionY + PET_BATTLE_PLAYER_DISTANCE * std::sin(facing), midpoint.m_positionY + PET_BATTLE_PLAYER_DISTANCE * std::sin(facing),
trainer->GetPositionZ()); trainer->GetPositionZ());