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/Entities/Player/Player.Combat.cs
+3 -3
View File
@@ -584,7 +584,7 @@ namespace Game.Entities
if (!HasUnitState(UnitState.AttackPlayer))
{
AddUnitState(UnitState.AttackPlayer);
AddPlayerFlag(PlayerFlags.ContestedPVP);
SetPlayerFlag(PlayerFlags.ContestedPVP);
// call MoveInLineOfSight for nearby contested guards
AIRelocationNotifier notifier = new(this);
Cell.VisitWorldObjects(this, notifier, GetVisibilityRange());
@@ -658,9 +658,9 @@ namespace Game.Entities
{
if (!IsFFAPvP())
{
AddPvpFlag(UnitPVPStateFlags.FFAPvp);
SetPvpFlag(UnitPVPStateFlags.FFAPvp);
foreach (var unit in m_Controlled)
unit.AddPvpFlag(UnitPVPStateFlags.FFAPvp);
unit.SetPvpFlag(UnitPVPStateFlags.FFAPvp);
}
}
else if (IsFFAPvP())
Source/Game/Entities/Player/Player.DB.cs
+3 -3
View File
@@ -1051,7 +1051,7 @@ namespace Game.Entities
{
_corpseLocation = new WorldLocation(result.Read<ushort>(0), result.Read<float>(1), result.Read<float>(2), result.Read<float>(3), result.Read<float>(4));
if (!CliDB.MapStorage.LookupByKey(_corpseLocation.GetMapId()).Instanceable())
AddPlayerLocalFlag(PlayerLocalFlags.ReleaseTimer);
SetPlayerLocalFlag(PlayerLocalFlags.ReleaseTimer);
else
RemovePlayerLocalFlag(PlayerLocalFlags.ReleaseTimer);
}
@@ -1394,7 +1394,7 @@ namespace Game.Entities
if (group)
{
if (group.IsLeader(GetGUID()))
AddPlayerFlag(PlayerFlags.GroupLeader);
SetPlayerFlag(PlayerFlags.GroupLeader);
byte subgroup = group.GetMemberGroup(GetGUID());
SetGroup(group, subgroup);
@@ -3310,7 +3310,7 @@ namespace Game.Entities
// RaF stuff.
if (GetSession().IsARecruiter() || (GetSession().GetRecruiterId() != 0))
AddDynamicFlag(UnitDynFlags.ReferAFriend);
SetDynamicFlag(UnitDynFlags.ReferAFriend);
_LoadDeclinedNames(holder.GetResult(PlayerLoginQueryLoad.DeclinedNames));
Source/Game/Entities/Player/Player.Items.cs
+8 -8
View File
@@ -1261,7 +1261,7 @@ namespace Game.Entities
Item item = Item.CreateItem(itemId, count, context, this);
if (item != null)
{
item.AddItemFlag(ItemFieldFlags.NewItem);
item.SetItemFlag(ItemFieldFlags.NewItem);
item.SetBonuses(bonusListIDs);
@@ -1306,7 +1306,7 @@ namespace Game.Entities
if (childItem)
{
childItem.SetCreator(item.GetGUID());
childItem.AddItemFlag(ItemFieldFlags.Child);
childItem.SetItemFlag(ItemFieldFlags.Child);
item.SetChildItem(childItem.GetGUID());
}
}
@@ -1586,7 +1586,7 @@ namespace Game.Entities
}
}
pItem.AddItemFlag2(ItemFieldFlags2.Equipped);
pItem.SetItemFlag2(ItemFieldFlags2.Equipped);
if (IsInWorld && update)
{
@@ -1759,7 +1759,7 @@ namespace Game.Entities
byte slot = (byte)(pos & 255);
VisualizeItem(slot, pItem);
pItem.AddItemFlag2(ItemFieldFlags2.Equipped);
pItem.SetItemFlag2(ItemFieldFlags2.Equipped);
if (IsInWorld)
{
@@ -2485,7 +2485,7 @@ namespace Game.Entities
if (pProto.HasFlag(ItemFlags.ItemPurchaseRecord) && crItem.ExtendedCost != 0 && pProto.GetMaxStackSize() == 1)
{
it.AddItemFlag(ItemFieldFlags.Refundable);
it.SetItemFlag(ItemFieldFlags.Refundable);
it.SetRefundRecipient(GetGUID());
it.SetPaidMoney((uint)price);
it.SetPaidExtendedCost(crItem.ExtendedCost);
@@ -6079,7 +6079,7 @@ namespace Game.Entities
return;
// Now we must make bones lootable, and send player loot
bones.AddCorpseDynamicFlag(CorpseDynFlags.Lootable);
bones.SetCorpseDynamicFlag(CorpseDynFlags.Lootable);
// We store the level of our player in the gold field
// We retrieve this information at Player.SendLoot()
@@ -6508,7 +6508,7 @@ namespace Game.Entities
m_AELootView[loot.GetGUID()] = guid;
if (loot_type == LootType.Corpse && !guid.IsItem())
AddUnitFlag(UnitFlags.Looting);
SetUnitFlag(UnitFlags.Looting);
}
else
SendLootError(loot.GetGUID(), guid, LootError.DidntKill);
@@ -6607,7 +6607,7 @@ namespace Game.Entities
//Void Storage
public bool IsVoidStorageUnlocked() { return HasPlayerFlag(PlayerFlags.VoidUnlocked); }
public void UnlockVoidStorage() { AddPlayerFlag(PlayerFlags.VoidUnlocked); }
public void UnlockVoidStorage() { SetPlayerFlag(PlayerFlags.VoidUnlocked); }
public void LockVoidStorage() { RemovePlayerFlag(PlayerFlags.VoidUnlocked); }
public byte GetNextVoidStorageFreeSlot()
Source/Game/Entities/Player/Player.Map.cs
+1 -1
View File
@@ -131,7 +131,7 @@ namespace Game.Entities
pvpInfo.IsInNoPvPArea = false;
if (area != null && area.IsSanctuary()) // in sanctuary
{
AddPvpFlag(UnitPVPStateFlags.Sanctuary);
SetPvpFlag(UnitPVPStateFlags.Sanctuary);
pvpInfo.IsInNoPvPArea = true;
if (duel == null && GetCombatManager().HasPvPCombat())
CombatStopWithPets();
Source/Game/Entities/Player/Player.cs
+24 -24
View File
@@ -237,11 +237,11 @@ namespace Game.Entities
InitDisplayIds();
if ((RealmType)WorldConfig.GetIntValue(WorldCfg.GameType) == RealmType.PVP || (RealmType)WorldConfig.GetIntValue(WorldCfg.GameType) == RealmType.RPPVP)
{
AddPvpFlag(UnitPVPStateFlags.PvP);
AddUnitFlag(UnitFlags.PlayerControlled);
SetPvpFlag(UnitPVPStateFlags.PvP);
SetUnitFlag(UnitFlags.PlayerControlled);
}
AddUnitFlag2(UnitFlags2.RegeneratePower);
SetUnitFlag2(UnitFlags2.RegeneratePower);
SetHoverHeight(1.0f); // default for players in 3.0.3
SetWatchedFactionIndex(0xFFFFFFFF);
@@ -2151,7 +2151,7 @@ namespace Game.Entities
public void SetDeveloper(bool on)
{
if (on)
AddPlayerFlag(PlayerFlags.Developer);
SetPlayerFlag(PlayerFlags.Developer);
else
RemovePlayerFlag(PlayerFlags.Developer);
}
@@ -2172,8 +2172,8 @@ namespace Game.Entities
{
m_ExtraFlags |= PlayerExtraFlags.GMOn;
SetFaction(35);
AddPlayerFlag(PlayerFlags.GM);
AddUnitFlag2(UnitFlags2.AllowCheatSpells);
SetPlayerFlag(PlayerFlags.GM);
SetUnitFlag2(UnitFlags2.AllowCheatSpells);
Pet pet = GetPet();
if (pet != null)
@@ -2202,7 +2202,7 @@ namespace Game.Entities
// restore FFA PvP Server state
if (Global.WorldMgr.IsFFAPvPRealm())
AddPvpFlag(UnitPVPStateFlags.FFAPvp);
SetPvpFlag(UnitPVPStateFlags.FFAPvp);
// restore FFA PvP area state, remove not allowed for GM mounts
UpdateArea(m_areaUpdateId);
@@ -4376,7 +4376,7 @@ namespace Game.Entities
RemoveAurasDueToSpell(8326); // SPELL_AURA_GHOST
if (GetSession().IsARecruiter() || (GetSession().GetRecruiterId() != 0))
AddDynamicFlag(UnitDynFlags.ReferAFriend);
SetDynamicFlag(UnitDynFlags.ReferAFriend);
SetDeathState(DeathState.Alive);
@@ -4458,7 +4458,7 @@ namespace Game.Entities
ReplaceAllDynamicFlags(UnitDynFlags.None);
if (!CliDB.MapStorage.LookupByKey(GetMapId()).Instanceable() && !HasAuraType(AuraType.PreventResurrection))
AddPlayerLocalFlag(PlayerLocalFlags.ReleaseTimer);
SetPlayerLocalFlag(PlayerLocalFlags.ReleaseTimer);
else
RemovePlayerLocalFlag(PlayerLocalFlags.ReleaseTimer);
@@ -5116,7 +5116,7 @@ namespace Game.Entities
if (enabled)
{
AddPlayerFlag(PlayerFlags.WarModeDesired);
SetPlayerFlag(PlayerFlags.WarModeDesired);
TogglePvpTalents(true);
SetPvP(true);
}
@@ -5133,7 +5133,7 @@ namespace Game.Entities
void SetWarModeLocal(bool enabled)
{
if (enabled)
AddPlayerLocalFlag(PlayerLocalFlags.WarMode);
SetPlayerLocalFlag(PlayerLocalFlags.WarMode);
else
RemovePlayerLocalFlag(PlayerLocalFlags.WarMode);
}
@@ -5174,12 +5174,12 @@ namespace Game.Entities
}
else
{
AddPlayerFlag(PlayerFlags.WarModeActive);
SetPlayerFlag(PlayerFlags.WarModeActive);
RemoveAurasDueToSpell(auraInside);
CastSpell(this, auraOutside, true);
}
SetWarModeLocal(true);
AddPvpFlag(UnitPVPStateFlags.PvP);
SetPvpFlag(UnitPVPStateFlags.PvP);
}
else
{
@@ -5312,7 +5312,7 @@ namespace Game.Entities
{
SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.GuildGUID), ObjectGuid.Create(HighGuid.Guild, guildId));
SetUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.GuildClubMemberID), GetGUID().GetCounter());
AddPlayerFlag(PlayerFlags.GuildLevelEnabled);
SetPlayerFlag(PlayerFlags.GuildLevelEnabled);
}
else
{
@@ -5450,7 +5450,7 @@ namespace Game.Entities
if (IsAFK())
RemovePlayerFlag(PlayerFlags.AFK);
else
AddPlayerFlag(PlayerFlags.AFK);
SetPlayerFlag(PlayerFlags.AFK);
// afk player not allowed in Battleground
if (!IsGameMaster() && IsAFK() && InBattleground() && !InArena())
@@ -5461,7 +5461,7 @@ namespace Game.Entities
if (IsDND())
RemovePlayerFlag(PlayerFlags.DND);
else
AddPlayerFlag(PlayerFlags.DND);
SetPlayerFlag(PlayerFlags.DND);
}
public bool IsAFK() { return HasPlayerFlag(PlayerFlags.AFK); }
public bool IsDND() { return HasPlayerFlag(PlayerFlags.DND); }
@@ -5994,14 +5994,14 @@ namespace Game.Entities
UnitFlags.Stunned | UnitFlags.InCombat | UnitFlags.Disarmed |
UnitFlags.Confused | UnitFlags.Fleeing | UnitFlags.Uninteractible |
UnitFlags.Skinnable | UnitFlags.Mount | UnitFlags.OnTaxi);
AddUnitFlag(UnitFlags.PlayerControlled); // must be set
SetUnitFlag(UnitFlags.PlayerControlled); // must be set
AddUnitFlag2(UnitFlags2.RegeneratePower);// must be set
SetUnitFlag2(UnitFlags2.RegeneratePower);// must be set
// cleanup player flags (will be re-applied if need at aura load), to avoid have ghost flag without ghost aura, for example.
RemovePlayerFlag(PlayerFlags.AFK | PlayerFlags.DND | PlayerFlags.GM | PlayerFlags.Ghost);
RemoveVisFlags(UnitVisFlags.All); // one form stealth modified bytes
RemoveVisFlag(UnitVisFlags.All); // one form stealth modified bytes
RemovePvpFlag(UnitPVPStateFlags.FFAPvp | UnitPVPStateFlags.Sanctuary);
// restore if need some important flags
@@ -7261,7 +7261,7 @@ namespace Game.Entities
public void SetSemaphoreTeleportFar(bool semphsetting) { mSemaphoreTeleport_Far = semphsetting; }
public bool IsReagentBankUnlocked() { return HasPlayerFlagEx(PlayerFlagsEx.ReagentBankUnlocked); }
public void UnlockReagentBank() { AddPlayerFlagEx(PlayerFlagsEx.ReagentBankUnlocked); }
public void UnlockReagentBank() { SetPlayerFlagEx(PlayerFlagsEx.ReagentBankUnlocked); }
//new
public uint DoRandomRoll(uint minimum, uint maximum)
@@ -7596,12 +7596,12 @@ namespace Game.Entities
}
public bool HasPlayerFlag(PlayerFlags flags) { return (m_playerData.PlayerFlags & (uint)flags) != 0; }
public void AddPlayerFlag(PlayerFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlags), (uint)flags); }
public void SetPlayerFlag(PlayerFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlags), (uint)flags); }
public void RemovePlayerFlag(PlayerFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlags), (uint)flags); }
public void ReplaceAllPlayerFlags(PlayerFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlags), (uint)flags); }
public bool HasPlayerFlagEx(PlayerFlagsEx flags) { return (m_playerData.PlayerFlagsEx & (uint)flags) != 0; }
public void AddPlayerFlagEx(PlayerFlagsEx flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlagsEx), (uint)flags); }
public void SetPlayerFlagEx(PlayerFlagsEx flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlagsEx), (uint)flags); }
public void RemovePlayerFlagEx(PlayerFlagsEx flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlagsEx), (uint)flags); }
public void ReplaceAllPlayerFlagsEx(PlayerFlagsEx flags) { SetUpdateFieldValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PlayerFlagsEx), (uint)flags); }
@@ -7680,7 +7680,7 @@ namespace Game.Entities
public ObjectGuid GetSummonedBattlePetGUID() { return m_activePlayerData.SummonedBattlePetGUID; }
public void SetSummonedBattlePetGUID(ObjectGuid guid) { SetUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.SummonedBattlePetGUID), guid); }
public void AddTrackCreatureFlag(uint flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.TrackCreatureMask), flags); }
public void SetTrackCreatureFlag(uint flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.TrackCreatureMask), flags); }
public void RemoveTrackCreatureFlag(uint flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.TrackCreatureMask), flags); }
public void SetVersatilityBonus(float value) { SetUpdateFieldStatValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.VersatilityBonus), value); }
@@ -7690,7 +7690,7 @@ namespace Game.Entities
public void ApplyModOverrideAPBySpellPowerPercent(float mod, bool apply) { ApplyModUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.OverrideAPBySpellPowerPercent), mod, apply); }
public bool HasPlayerLocalFlag(PlayerLocalFlags flags) { return (m_activePlayerData.LocalFlags & (int)flags) != 0; }
public void AddPlayerLocalFlag(PlayerLocalFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.LocalFlags), (uint)flags); }
public void SetPlayerLocalFlag(PlayerLocalFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.LocalFlags), (uint)flags); }
public void RemovePlayerLocalFlag(PlayerLocalFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.LocalFlags), (uint)flags); }
public void ReplaceAllPlayerLocalFlags(PlayerLocalFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_activePlayerData).ModifyValue(m_activePlayerData.LocalFlags), (uint)flags); }
Source/Game/Entities/Player/RestMgr.cs
+1 -1
View File
@@ -88,7 +88,7 @@ namespace Game.Entities
if (oldRestMask == 0 && _restFlagMask != 0) // only set flag/time on the first rest state
{
_restTime = GameTime.GetGameTime();
_player.AddPlayerFlag(PlayerFlags.Resting);
_player.SetPlayerFlag(PlayerFlags.Resting);
}
if (triggerId != 0)