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

fix(Core/Player): Enable water walking when dead on instances (#5393)

Browse Source
This commit is contained in:
Silker
2021-04-21 19:12:40 -06:00
committed by GitHub
parent 325dcfc9a6
commit 0d36f0b7a5
1 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+14 -27
View File
@@ -5238,24 +5238,22 @@ void Player::BuildPlayerRepop()
WorldPacket data(SMSG_PRE_RESURRECT, GetPackGUID().size()); WorldPacket data(SMSG_PRE_RESURRECT, GetPackGUID().size());
data.append(GetPackGUID()); data.append(GetPackGUID());
GetSession()->SendPacket(&data); GetSession()->SendPacket(&data);
if (getRace(true) == RACE_NIGHTELF) if (getRace(true) == RACE_NIGHTELF)
{
CastSpell(this, 20584, true); CastSpell(this, 20584, true);
}
CastSpell(this, 8326, true); CastSpell(this, 8326, true);
// there must be SMSG.FORCE_RUN_SPEED_CHANGE, SMSG.FORCE_SWIM_SPEED_CHANGE, SMSG.MOVE_WATER_WALK // there must be SMSG.FORCE_RUN_SPEED_CHANGE, SMSG.FORCE_SWIM_SPEED_CHANGE, SMSG.MOVE_WATER_WALK
// there must be SMSG.STOP_MIRROR_TIMER // there must be SMSG.STOP_MIRROR_TIMER
// there we must send 888 opcode // there we must send 888 opcode
// the player cannot have a corpse already, only bones which are not returned by GetCorpse if (GetCorpse()) // the player cannot have a corpse already, only bones which are not returned by GetCorpse
if (GetCorpse())
{ {
LOG_ERROR("server", "BuildPlayerRepop: player %s(%d) already has a corpse", GetName().c_str(), GetGUIDLow()); LOG_ERROR("server", "BuildPlayerRepop: player %s(%d) already has a corpse", GetName().c_str(), GetGUIDLow());
return; return;
} }
CreateCorpse(); // create a corpse and place it at the player's location
// create a corpse and place it at the player's location
CreateCorpse();
Corpse* corpse = GetCorpse(); Corpse* corpse = GetCorpse();
if (!corpse) if (!corpse)
{ {
@@ -5263,30 +5261,22 @@ void Player::BuildPlayerRepop()
return; return;
} }
GetMap()->AddToMap(corpse); GetMap()->AddToMap(corpse);
SetHealth(1); // convert player body to ghost
// convert player body to ghost
SetHealth(1);
SetMovement(MOVE_WATER_WALK); SetMovement(MOVE_WATER_WALK);
SetWaterWalking(true);
if (!GetSession()->isLogingOut()) if (!GetSession()->isLogingOut())
{
SetMovement(MOVE_UNROOT); SetMovement(MOVE_UNROOT);
}
// BG - remove insignia related RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); // BG - remove insignia related
RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
int32 corpseReclaimDelay = CalculateCorpseReclaimDelay(); int32 corpseReclaimDelay = CalculateCorpseReclaimDelay();
if (corpseReclaimDelay >= 0) if (corpseReclaimDelay >= 0)
{
SendCorpseReclaimDelay(corpseReclaimDelay); SendCorpseReclaimDelay(corpseReclaimDelay);
}
// to prevent cheating corpse->ResetGhostTime(); // to prevent cheating
corpse->ResetGhostTime(); StopMirrorTimers(); // disable timers on bars
SetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER, UNIT_BYTE1_FLAG_ALWAYS_STAND); // set and clear other
StopMirrorTimers(); //disable timers(bars)
// set and clear other
SetByteValue(UNIT_FIELD_BYTES_1, UNIT_BYTES_1_OFFSET_ANIM_TIER, UNIT_BYTE1_FLAG_ALWAYS_STAND);
sScriptMgr->OnPlayerReleasedGhost(this); sScriptMgr->OnPlayerReleasedGhost(this);
} }
@@ -5310,12 +5300,9 @@ void Player::ResurrectPlayer(float restore_percent, bool applySickness)
SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_REFER_A_FRIEND); SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_REFER_A_FRIEND);
setDeathState(ALIVE); setDeathState(ALIVE);
SetMovement(MOVE_LAND_WALK); SetMovement(MOVE_LAND_WALK);
SetMovement(MOVE_UNROOT); SetMovement(MOVE_UNROOT);
SetWaterWalking(false); SetWaterWalking(false);
m_deathTimer = 0; m_deathTimer = 0;
// set health/powers (0- will be set in caller) // set health/powers (0- will be set in caller)