Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Misc: Rename AddXXXFlag updatefield functions to SetXXXFlag

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/b47185cabfbdeeaf492bf2303635db07ce703785)
This commit is contained in:
hondacrx
2022-05-30 16:12:11 -04:00
parent f53c4cb009
commit 442da7511f
43 changed files with 188 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Handlers/AzeriteHandler.cs
+1 -1
View File
@@ -184,7 +184,7 @@ namespace Game
if (item == null || !item.IsAzeriteEmpoweredItem())
return;
item.AddItemFlag(ItemFieldFlags.AzeriteEmpoweredItemViewed);
item.SetItemFlag(ItemFieldFlags.AzeriteEmpoweredItemViewed);
item.SetState(ItemUpdateState.Changed, _player);
}
Source/Game/Handlers/CharacterHandler.cs
+1 -1
View File
@@ -937,7 +937,7 @@ namespace Game
// Set FFA PvP for non GM in non-rest mode
if (Global.WorldMgr.IsFFAPvPRealm() && !pCurrChar.IsGameMaster() && !pCurrChar.HasPlayerFlag(PlayerFlags.Resting))
pCurrChar.AddPvpFlag(UnitPVPStateFlags.FFAPvp);
pCurrChar.SetPvpFlag(UnitPVPStateFlags.FFAPvp);
if (pCurrChar.HasPlayerFlag(PlayerFlags.ContestedPVP))
pCurrChar.SetContestedPvP();
Source/Game/Handlers/GuildHandler.cs
+1 -1
View File
@@ -606,7 +606,7 @@ namespace Game
void HandleDeclineGuildInvites(DeclineGuildInvites packet)
{
if (packet.Allow)
GetPlayer().AddPlayerFlag(PlayerFlags.AutoDeclineGuild);
GetPlayer().SetPlayerFlag(PlayerFlags.AutoDeclineGuild);
else
GetPlayer().RemovePlayerFlag(PlayerFlags.AutoDeclineGuild);
}
Source/Game/Handlers/LogoutHandler.cs
+1 -1
View File
@@ -68,7 +68,7 @@ namespace Game
if (pl.GetStandState() == UnitStandStateType.Stand)
pl.SetStandState(UnitStandStateType.Sit);
pl.SetRooted(true);
pl.AddUnitFlag(UnitFlags.Stunned);
pl.SetUnitFlag(UnitFlags.Stunned);
}
SetLogoutStartTime(GameTime.GetGameTime());
Source/Game/Handlers/MailHandler.cs
+1 -1
View File
@@ -621,7 +621,7 @@ namespace Game
if (m.messageType == MailMessageType.Normal)
bodyItem.SetCreator(ObjectGuid.Create(HighGuid.Player, m.sender));
bodyItem.AddItemFlag(ItemFieldFlags.Readable);
bodyItem.SetItemFlag(ItemFieldFlags.Readable);
Log.outInfo(LogFilter.Network, "HandleMailCreateTextItem mailid={0}", createTextItem.MailID);
Source/Game/Handlers/MiscHandler.cs
+5 -5
View File
@@ -509,7 +509,7 @@ namespace Game
{
if (!GetPlayer().HasPlayerFlag(PlayerFlags.InPVP))
{
GetPlayer().AddPlayerFlag(PlayerFlags.InPVP);
GetPlayer().SetPlayerFlag(PlayerFlags.InPVP);
GetPlayer().RemovePlayerFlag(PlayerFlags.PVPTimer);
if (!GetPlayer().IsPvP() || GetPlayer().pvpInfo.EndTimer != 0)
GetPlayer().UpdatePvP(true, true);
@@ -517,7 +517,7 @@ namespace Game
else if (!GetPlayer().IsWarModeLocalActive())
{
GetPlayer().RemovePlayerFlag(PlayerFlags.InPVP);
GetPlayer().AddPlayerFlag(PlayerFlags.PVPTimer);
GetPlayer().SetPlayerFlag(PlayerFlags.PVPTimer);
if (!GetPlayer().pvpInfo.IsHostile && GetPlayer().IsPvP())
GetPlayer().pvpInfo.EndTimer = GameTime.GetGameTime(); // start toggle-off
}
@@ -528,7 +528,7 @@ namespace Game
{
if (packet.EnablePVP)
{
GetPlayer().AddPlayerFlag(PlayerFlags.InPVP);
GetPlayer().SetPlayerFlag(PlayerFlags.InPVP);
GetPlayer().RemovePlayerFlag(PlayerFlags.PVPTimer);
if (!GetPlayer().IsPvP() || GetPlayer().pvpInfo.EndTimer != 0)
GetPlayer().UpdatePvP(true, true);
@@ -536,7 +536,7 @@ namespace Game
else if (!GetPlayer().IsWarModeLocalActive())
{
GetPlayer().RemovePlayerFlag(PlayerFlags.InPVP);
GetPlayer().AddPlayerFlag(PlayerFlags.PVPTimer);
GetPlayer().SetPlayerFlag(PlayerFlags.PVPTimer);
if (!GetPlayer().pvpInfo.IsHostile && GetPlayer().IsPvP())
GetPlayer().pvpInfo.EndTimer = GameTime.GetGameTime(); // start toggle-off
}
@@ -759,7 +759,7 @@ namespace Game
void HandleSetTaxiBenchmark(SetTaxiBenchmarkMode packet)
{
if (packet.Enable)
_player.AddPlayerFlag(PlayerFlags.TaxiBenchmark);
_player.SetPlayerFlag(PlayerFlags.TaxiBenchmark);
else
_player.RemovePlayerFlag(PlayerFlags.TaxiBenchmark);
}
Source/Game/Handlers/MovementHandler.cs
+1 -1
View File
@@ -191,7 +191,7 @@ namespace Game
if (plrMover.IsAlive())
{
Log.outDebug(LogFilter.Player, $"FALLDAMAGE Below map. Map min height: {plrMover.GetMap().GetMinHeight(plrMover.GetPhaseShift(), movementInfo.Pos.GetPositionX(), movementInfo.Pos.GetPositionY())}, Player debug info:\n{plrMover.GetDebugInfo()}");
plrMover.AddPlayerFlag(PlayerFlags.IsOutOfBounds);
plrMover.SetPlayerFlag(PlayerFlags.IsOutOfBounds);
plrMover.EnvironmentalDamage(EnviromentalDamage.FallToVoid, (uint)GetPlayer().GetMaxHealth());
// player can be alive if GM/etc
// change the death state to CORPSE to prevent the death timer from