mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 07:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Sync] Some minor project sync

Browse source
This commit is contained in:
Antz 2017-01-09 21:35:12 +00:00 • committed by Antz
parent 7332173b6e
commit 461923f632
35 changed files with 3690 additions and 1585 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/Object/Player.cpp
View file

@ -2390,7 +2390,7 @@ void Player::SetInWater(bool apply)
// remove auras that need water/land
RemoveAurasWithInterruptFlags(apply ? AURA_INTERRUPT_FLAG_NOT_ABOVEWATER : AURA_INTERRUPT_FLAG_NOT_UNDERWATER);
getHostileRefManager().updateThreatTables();
GetHostileRefManager().updateThreatTables();
}
struct SetGameMasterOnHelper
@ -2399,7 +2399,7 @@ struct SetGameMasterOnHelper
void operator()(Unit* unit) const
{
unit->setFaction(35);
unit->getHostileRefManager().setOnlineOfflineState(false);
unit->GetHostileRefManager().setOnlineOfflineState(false);
}
};
@ -2409,7 +2409,7 @@ struct SetGameMasterOffHelper
void operator()(Unit* unit) const
{
unit->setFaction(faction);
unit->getHostileRefManager().setOnlineOfflineState(true);
unit->GetHostileRefManager().setOnlineOfflineState(true);
}
uint32 faction;
};
@ -2427,7 +2427,7 @@ void Player::SetGameMaster(bool on)
SetFFAPvP(false);
ResetContestedPvP();
getHostileRefManager().setOnlineOfflineState(false);
GetHostileRefManager().setOnlineOfflineState(false);
CombatStopWithPets();
SetPhaseMask(PHASEMASK_ANYWHERE, false); // see and visible in all phases
@ -2458,7 +2458,7 @@ void Player::SetGameMaster(bool on)
// restore FFA PvP area state, remove not allowed for GM mounts
UpdateArea(m_areaUpdateId);
getHostileRefManager().setOnlineOfflineState(true);
GetHostileRefManager().setOnlineOfflineState(true);
}
m_camera.UpdateVisibilityForOwner();