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/Corpse.cs
+1 -1
View File
@@ -286,7 +286,7 @@ namespace Game.Entities
}
public CorpseDynFlags GetCorpseDynamicFlags() { return (CorpseDynFlags)(uint)m_corpseData.DynamicFlags; }
public void AddCorpseDynamicFlag(CorpseDynFlags dynamicFlags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_corpseData).ModifyValue(m_corpseData.DynamicFlags), (uint)dynamicFlags); }
public void SetCorpseDynamicFlag(CorpseDynFlags dynamicFlags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_corpseData).ModifyValue(m_corpseData.DynamicFlags), (uint)dynamicFlags); }
public void RemoveCorpseDynamicFlag(CorpseDynFlags dynamicFlags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_corpseData).ModifyValue(m_corpseData.DynamicFlags), (uint)dynamicFlags); }
public void ReplaceAllCorpseDynamicFlags(CorpseDynFlags dynamicFlags) { SetUpdateFieldValue(m_values.ModifyValue(m_corpseData).ModifyValue(m_corpseData.DynamicFlags), (uint)dynamicFlags); }
public override ObjectGuid GetOwnerGUID() { return m_corpseData.Owner; }
Source/Game/Entities/Creature/Creature.cs
+4 -4
View File
@@ -414,7 +414,7 @@ namespace Game.Entities
// trigger creature is always not selectable and can not be attacked
if (IsTrigger())
AddUnitFlag(UnitFlags.Uninteractible);
SetUnitFlag(UnitFlags.Uninteractible);
InitializeReactState();
@@ -1228,7 +1228,7 @@ namespace Game.Entities
else
m_lootRecipientGroup = ObjectGuid.Empty;
AddDynamicFlag(UnitDynFlags.Tapped);
SetDynamicFlag(UnitDynFlags.Tapped);
}
public bool IsTappedBy(Player player)
@@ -2601,7 +2601,7 @@ namespace Game.Entities
// Check if the creature has UNIT_FLAG_CAN_SWIM and add it if it's missing
// Creatures must be able to chase a target in water if they can enter water
if (_isMissingCanSwimFlagOutOfCombat && CanEnterWater())
AddUnitFlag(UnitFlags.CanSwim);
SetUnitFlag(UnitFlags.CanSwim);
}
public bool HasCanSwimFlagOutOfCombat()
@@ -2613,7 +2613,7 @@ namespace Game.Entities
{
if (loot.loot_type != LootType.Skinning && !IsPet() && GetCreatureTemplate().SkinLootId != 0 && HasLootRecipient())
if (LootStorage.Skinning.HaveLootFor(GetCreatureTemplate().SkinLootId))
AddUnitFlag(UnitFlags.Skinnable);
SetUnitFlag(UnitFlags.Skinnable);
long now = GameTime.GetGameTime();
// Do not reset corpse remove time if corpse is already removed
Source/Game/Entities/GameObject/GameObject.cs
+11 -11
View File
@@ -363,7 +363,7 @@ namespace Game.Entities
break;
case GameObjectTypes.PhaseableMo:
RemoveFlag((GameObjectFlags)0xF00);
AddFlag((GameObjectFlags)((m_goInfo.PhaseableMO.AreaNameSet & 0xF) << 8));
SetFlag((GameObjectFlags)((m_goInfo.PhaseableMO.AreaNameSet & 0xF) << 8));
break;
case GameObjectTypes.CapturePoint:
SetUpdateFieldValue(m_values.ModifyValue(m_gameObjectData).ModifyValue(m_gameObjectData.SpellVisualID), m_goInfo.CapturePoint.SpellVisual1);
@@ -1161,7 +1161,7 @@ namespace Game.Entities
if (!GetGoInfo().GetDespawnPossibility() && !GetGoInfo().IsDespawnAtAction())
{
AddFlag(GameObjectFlags.NoDespawn);
SetFlag(GameObjectFlags.NoDespawn);
m_respawnDelayTime = 0;
m_respawnTime = 0;
}
@@ -1507,7 +1507,7 @@ namespace Game.Entities
RemoveFlag(GameObjectFlags.Locked);
break;
case GameObjectActions.Lock:
AddFlag(GameObjectFlags.Locked);
SetFlag(GameObjectFlags.Locked);
break;
case GameObjectActions.Open:
if (unitCaster)
@@ -1538,14 +1538,14 @@ namespace Game.Entities
DespawnOrUnsummon();
break;
case GameObjectActions.MakeInert:
AddFlag(GameObjectFlags.NotSelectable);
SetFlag(GameObjectFlags.NotSelectable);
break;
case GameObjectActions.MakeActive:
RemoveFlag(GameObjectFlags.NotSelectable);
break;
case GameObjectActions.CloseAndLock:
ResetDoorOrButton();
AddFlag(GameObjectFlags.Locked);
SetFlag(GameObjectFlags.Locked);
break;
case GameObjectActions.UseArtKit0:
case GameObjectActions.UseArtKit1:
@@ -1648,7 +1648,7 @@ namespace Game.Entities
void SwitchDoorOrButton(bool activate, bool alternative = false)
{
if (activate)
AddFlag(GameObjectFlags.InUse);
SetFlag(GameObjectFlags.InUse);
else
RemoveFlag(GameObjectFlags.InUse);
@@ -1861,7 +1861,7 @@ namespace Game.Entities
if (trapEntry != 0)
TriggeringLinkedGameObject(trapEntry, user);
AddFlag(GameObjectFlags.InUse);
SetFlag(GameObjectFlags.InUse);
SetLootState(LootState.Activated, user);
// this appear to be ok, however others exist in addition to this that should have custom (ex: 190510, 188692, 187389)
@@ -2648,7 +2648,7 @@ namespace Game.Entities
GetAI().Damaged(attackerOrHealer, m_goInfo.DestructibleBuilding.DamagedEvent);
RemoveFlag(GameObjectFlags.Destroyed);
AddFlag(GameObjectFlags.Damaged);
SetFlag(GameObjectFlags.Damaged);
uint modelId = m_goInfo.displayId;
DestructibleModelDataRecord modelData = CliDB.DestructibleModelDataStorage.LookupByKey(m_goInfo.DestructibleBuilding.DestructibleModelRec);
@@ -2682,7 +2682,7 @@ namespace Game.Entities
}
RemoveFlag(GameObjectFlags.Damaged);
AddFlag(GameObjectFlags.Destroyed);
SetFlag(GameObjectFlags.Destroyed);
uint modelId = m_goInfo.displayId;
DestructibleModelDataRecord modelData = CliDB.DestructibleModelDataStorage.LookupByKey(m_goInfo.DestructibleBuilding.DestructibleModelRec);
@@ -3307,7 +3307,7 @@ namespace Game.Entities
public uint GetRespawnDelay() { return m_respawnDelayTime; }
public bool HasFlag(GameObjectFlags flags) { return (m_gameObjectData.Flags & (uint)flags) != 0; }
public void AddFlag(GameObjectFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_gameObjectData).ModifyValue(m_gameObjectData.Flags), (uint)flags); }
public void SetFlag(GameObjectFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_gameObjectData).ModifyValue(m_gameObjectData.Flags), (uint)flags); }
public void RemoveFlag(GameObjectFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_gameObjectData).ModifyValue(m_gameObjectData.Flags), (uint)flags); }
public void ReplaceAllFlags(GameObjectFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_gameObjectData).ModifyValue(m_gameObjectData.Flags), (uint)flags); }
public void SetLevel(uint level) { SetUpdateFieldValue(m_values.ModifyValue(m_gameObjectData).ModifyValue(m_gameObjectData.Level), level); }
@@ -3415,7 +3415,7 @@ namespace Game.Entities
{
m_model = GameObjectModel.Create(new GameObjectModelOwnerImpl(this));
if (m_model != null && m_model.IsMapObject())
AddFlag(GameObjectFlags.MapObject);
SetFlag(GameObjectFlags.MapObject);
}
// There's many places not ready for dynamic spawns. This allows them to live on for now.
Source/Game/Entities/Item/Item.cs
+4 -4
View File
@@ -1466,7 +1466,7 @@ namespace Game.Entities
public void SetSoulboundTradeable(List<ObjectGuid> allowedLooters)
{
AddItemFlag(ItemFieldFlags.BopTradeable);
SetItemFlag(ItemFieldFlags.BopTradeable);
allowedGUIDs = allowedLooters;
}
@@ -2562,7 +2562,7 @@ namespace Game.Entities
public void SetBinding(bool val)
{
if (val)
AddItemFlag(ItemFieldFlags.Soulbound);
SetItemFlag(ItemFieldFlags.Soulbound);
else
RemoveItemFlag(ItemFieldFlags.Soulbound);
}
@@ -2572,11 +2572,11 @@ namespace Game.Entities
public bool IsBattlenetAccountBound() { return GetTemplate().HasFlag(ItemFlags2.BnetAccountTradeOk); }
public bool HasItemFlag(ItemFieldFlags flag) { return (m_itemData.DynamicFlags & (uint)flag) != 0; }
public void AddItemFlag(ItemFieldFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags), (uint)flags); }
public void SetItemFlag(ItemFieldFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags), (uint)flags); }
public void RemoveItemFlag(ItemFieldFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags), (uint)flags); }
public void ReplaceAllItemFlags(ItemFieldFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags), (uint)flags); }
public bool HasItemFlag2(ItemFieldFlags2 flag) { return (m_itemData.DynamicFlags2 & (uint)flag) != 0; }
public void AddItemFlag2(ItemFieldFlags2 flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags2), (uint)flags); }
public void SetItemFlag2(ItemFieldFlags2 flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags2), (uint)flags); }
public void RemoveItemFlag2(ItemFieldFlags2 flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags2), (uint)flags); }
public void ReplaceAllItemFlags2(ItemFieldFlags2 flags) { SetUpdateFieldValue(m_values.ModifyValue(m_itemData).ModifyValue(m_itemData.DynamicFlags2), (uint)flags); }
Source/Game/Entities/Object/WorldObject.cs
+1 -1
View File
@@ -2937,7 +2937,7 @@ namespace Game.Entities
public UnitDynFlags GetDynamicFlags() { return (UnitDynFlags)(uint)m_objectData.DynamicFlags; }
public bool HasDynamicFlag(UnitDynFlags flag) { return (m_objectData.DynamicFlags & (uint)flag) != 0; }
public void AddDynamicFlag(UnitDynFlags flag) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_objectData).ModifyValue(m_objectData.DynamicFlags), (uint)flag); }
public void SetDynamicFlag(UnitDynFlags flag) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_objectData).ModifyValue(m_objectData.DynamicFlags), (uint)flag); }
public void RemoveDynamicFlag(UnitDynFlags flag) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_objectData).ModifyValue(m_objectData.DynamicFlags), (uint)flag); }
public void ReplaceAllDynamicFlags(UnitDynFlags flag) { SetUpdateFieldValue(m_values.ModifyValue(m_objectData).ModifyValue(m_objectData.DynamicFlags), (uint)flag); }
Source/Game/Entities/Pet.cs
+1 -1
View File
@@ -1378,7 +1378,7 @@ namespace Game.Entities
return false;
// Force regen flag for player pets, just like we do for players themselves
AddUnitFlag2(UnitFlags2.RegeneratePower);
SetUnitFlag2(UnitFlags2.RegeneratePower);
SetSheath(SheathState.Melee);
GetThreatManager().Initialize();
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)
Source/Game/Entities/Unit/Unit.Combat.cs
+1 -1
View File
@@ -914,7 +914,7 @@ namespace Game.Entities
{
// must be after setDeathState which resets dynamic flags
if (!creature.loot.IsLooted())
creature.AddDynamicFlag(UnitDynFlags.Lootable);
creature.SetDynamicFlag(UnitDynFlags.Lootable);
else
creature.AllLootRemovedFromCorpse();
}
Source/Game/Entities/Unit/Unit.Movement.cs
+4 -4
View File
@@ -1271,7 +1271,7 @@ namespace Game.Entities
if (apply)
{
SetTarget(ObjectGuid.Empty);
AddUnitFlag(UnitFlags.Stunned);
SetUnitFlag(UnitFlags.Stunned);
StopMoving();
@@ -1405,7 +1405,7 @@ namespace Game.Entities
if (mount != 0)
SetMountDisplayId(mount);
AddUnitFlag(UnitFlags.Mount);
SetUnitFlag(UnitFlags.Mount);
Player player = ToPlayer();
if (player != null)
@@ -1429,7 +1429,7 @@ namespace Game.Entities
Battleground bg = ToPlayer().GetBattleground();
// don't unsummon pet in arena but SetFlag UNIT_FLAG_STUNNED to disable pet's interface
if (bg && bg.IsArena())
pet.AddUnitFlag(UnitFlags.Stunned);
pet.SetUnitFlag(UnitFlags.Stunned);
else
player.UnsummonPetTemporaryIfAny();
}
@@ -1438,7 +1438,7 @@ namespace Game.Entities
Unit charm = player.GetCharmed();
if (charm)
if (charm.GetTypeId() == TypeId.Unit)
charm.AddUnitFlag(UnitFlags.Stunned);
charm.SetUnitFlag(UnitFlags.Stunned);
player.SendMovementSetCollisionHeight(player.GetCollisionHeight(), UpdateCollisionHeightReason.Mount);
}
Source/Game/Entities/Unit/Unit.Pets.cs
+9 -9
View File
@@ -121,7 +121,7 @@ namespace Game.Entities
if (IsTypeId(TypeId.Player))
{
minion.m_ControlledByPlayer = true;
minion.AddUnitFlag(UnitFlags.PlayerControlled);
minion.SetUnitFlag(UnitFlags.PlayerControlled);
}
// Can only have one pet. If a new one is summoned, dismiss the old one.
@@ -391,13 +391,13 @@ namespace Game.Entities
switch (type)
{
case CharmType.Vehicle:
AddUnitFlag(UnitFlags.Possessed);
SetUnitFlag(UnitFlags.Possessed);
playerCharmer.SetClientControl(this, true);
playerCharmer.VehicleSpellInitialize();
break;
case CharmType.Possess:
AddUnitFlag(UnitFlags.Possessed);
charmer.AddUnitFlag(UnitFlags.RemoveClientControl);
SetUnitFlag(UnitFlags.Possessed);
charmer.SetUnitFlag(UnitFlags.RemoveClientControl);
playerCharmer.SetClientControl(this, true);
playerCharmer.PossessSpellInitialize();
AddUnitState(UnitState.Possessed);
@@ -583,7 +583,7 @@ namespace Game.Entities
charm.m_ControlledByPlayer = true;
// @todo maybe we can use this flag to check if controlled by player
charm.AddUnitFlag(UnitFlags.PlayerControlled);
charm.SetUnitFlag(UnitFlags.PlayerControlled);
}
else
charm.m_ControlledByPlayer = false;
@@ -621,13 +621,13 @@ namespace Game.Entities
if (charm.IsTypeId(TypeId.Player))
{
charm.m_ControlledByPlayer = true;
charm.AddUnitFlag(UnitFlags.PlayerControlled);
charm.SetUnitFlag(UnitFlags.PlayerControlled);
charm.ToPlayer().UpdatePvPState();
}
else if (player)
{
charm.m_ControlledByPlayer = true;
charm.AddUnitFlag(UnitFlags.PlayerControlled);
charm.SetUnitFlag(UnitFlags.PlayerControlled);
charm.ReplaceAllPvpFlags(player.GetPvpFlags());
}
else
@@ -788,7 +788,7 @@ namespace Game.Entities
pet.SetCreatedBySpell(spell_id);
if (IsTypeId(TypeId.Player))
pet.AddUnitFlag(UnitFlags.PlayerControlled);
pet.SetUnitFlag(UnitFlags.PlayerControlled);
if (!pet.InitStatsForLevel(level))
{
@@ -826,7 +826,7 @@ namespace Game.Entities
}
if (state)
AddUnitFlag(UnitFlags.PetInCombat);
SetUnitFlag(UnitFlags.PetInCombat);
else
RemoveUnitFlag(UnitFlags.PetInCombat);
}
Source/Game/Entities/Unit/Unit.cs
+16 -13
View File
@@ -800,12 +800,15 @@ namespace Game.Entities
m_areaTrigger[0].Remove();
}
public NPCFlags GetNpcFlags() { return (NPCFlags)m_unitData.NpcFlags[0]; }
public bool HasNpcFlag(NPCFlags flags) { return (m_unitData.NpcFlags[0] & (uint)flags) != 0; }
public void AddNpcFlag(NPCFlags flags) { SetUpdateFieldFlagValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 0), (uint)flags); }
public void SetNpcFlag(NPCFlags flags) { SetUpdateFieldFlagValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 0), (uint)flags); }
public void RemoveNpcFlag(NPCFlags flags) { RemoveUpdateFieldFlagValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 0), (uint)flags); }
public void ReplaceAllNpcFlags(NPCFlags flags) { SetUpdateFieldValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 0), (uint)flags); }
public NPCFlags2 GetNpcFlags2() { return (NPCFlags2)m_unitData.NpcFlags[1]; }
public bool HasNpcFlag2(NPCFlags2 flags) { return (m_unitData.NpcFlags[1] & (uint)flags) != 0; }
public void AddNpcFlag2(NPCFlags2 flags) { SetUpdateFieldFlagValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 1), (uint)flags); }
public void SetNpcFlag2(NPCFlags2 flags) { SetUpdateFieldFlagValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 1), (uint)flags); }
public void RemoveNpcFlag2(NPCFlags2 flags) { RemoveUpdateFieldFlagValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 1), (uint)flags); }
public void ReplaceAllNpcFlags2(NPCFlags2 flags) { SetUpdateFieldValue(ref m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.NpcFlags, 1), (uint)flags); }
@@ -1982,15 +1985,15 @@ namespace Game.Entities
public void SetWildBattlePetLevel(uint wildBattlePetLevel) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.WildBattlePetLevel), wildBattlePetLevel); }
public bool HasUnitFlag(UnitFlags flags) { return (m_unitData.Flags & (uint)flags) != 0; }
public void AddUnitFlag(UnitFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags), (uint)flags); }
public void SetUnitFlag(UnitFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags), (uint)flags); }
public void RemoveUnitFlag(UnitFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags), (uint)flags); }
public void ReplaceAllUnitFlags(UnitFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags), (uint)flags); }
public bool HasUnitFlag2(UnitFlags2 flags) { return (m_unitData.Flags2 & (uint)flags) != 0; }
public void AddUnitFlag2(UnitFlags2 flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags2), (uint)flags); }
public void SetUnitFlag2(UnitFlags2 flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags2), (uint)flags); }
public void RemoveUnitFlag2(UnitFlags2 flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags2), (uint)flags); }
public void ReplaceAllUnitFlags2(UnitFlags2 flags) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags2), (uint)flags); }
public bool HasUnitFlag3(UnitFlags3 flags) { return (m_unitData.Flags3 & (uint)flags) != 0; }
public void AddUnitFlag3(UnitFlags3 flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags3), (uint)flags); }
public void SetUnitFlag3(UnitFlags3 flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags3), (uint)flags); }
public void RemoveUnitFlag3(UnitFlags3 flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags3), (uint)flags); }
public void ReplaceAllUnitFlags3(UnitFlags3 flags) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.Flags3), (uint)flags); }
@@ -2003,7 +2006,7 @@ namespace Game.Entities
public UnitPVPStateFlags GetPvpFlags() { return (UnitPVPStateFlags)(byte)m_unitData.PvpFlags; }
public bool HasPvpFlag(UnitPVPStateFlags flags) { return (m_unitData.PvpFlags & (uint)flags) != 0; }
public void AddPvpFlag(UnitPVPStateFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PvpFlags), (byte)flags); }
public void SetPvpFlag(UnitPVPStateFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PvpFlags), (byte)flags); }
public void RemovePvpFlag(UnitPVPStateFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PvpFlags), (byte)flags); }
public void ReplaceAllPvpFlags(UnitPVPStateFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PvpFlags), (byte)flags); }
public bool IsInSanctuary() { return HasPvpFlag(UnitPVPStateFlags.Sanctuary); }
@@ -2015,7 +2018,7 @@ namespace Game.Entities
return (UnitPetFlags)(byte)m_unitData.PetFlags;
}
public bool HasPetFlag(UnitPetFlags flags) { return (m_unitData.PetFlags & (byte)flags) != 0; }
public void AddPetFlag(UnitPetFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PetFlags), (byte)flags); }
public void SetPetFlag(UnitPetFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PetFlags), (byte)flags); }
public void RemovePetFlag(UnitPetFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PetFlags), (byte)flags); }
public void ReplaceAllPetFlags(UnitPetFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.PetFlags), (byte)flags); }
@@ -2163,8 +2166,8 @@ namespace Game.Entities
}
public UnitStandStateType GetStandState() { return (UnitStandStateType)(byte)m_unitData.StandState; }
public void AddVisFlags(UnitVisFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.VisFlags), (byte)flags); }
public void RemoveVisFlags(UnitVisFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.VisFlags), (byte)flags); }
public void SetVisFlag(UnitVisFlags flags) { SetUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.VisFlags), (byte)flags); }
public void RemoveVisFlag(UnitVisFlags flags) { RemoveUpdateFieldFlagValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.VisFlags), (byte)flags); }
public void ReplaceAllVisFlags(UnitVisFlags flags) { SetUpdateFieldValue(m_values.ModifyValue(m_unitData).ModifyValue(m_unitData.VisFlags), (byte)flags); }
public bool IsSitState()
@@ -2983,7 +2986,7 @@ namespace Game.Entities
{
if (apply)
{
AddUnitFlag(UnitFlags.ImmuneToPc | UnitFlags.ImmuneToNpc);
SetUnitFlag(UnitFlags.ImmuneToPc | UnitFlags.ImmuneToNpc);
ValidateAttackersAndOwnTarget();
if (!keepCombat)
m_combatManager.EndAllCombat();
@@ -3000,7 +3003,7 @@ namespace Game.Entities
{
if (apply)
{
AddUnitFlag(UnitFlags.ImmuneToPc);
SetUnitFlag(UnitFlags.ImmuneToPc);
ValidateAttackersAndOwnTarget();
if (!keepCombat)
{
@@ -3029,7 +3032,7 @@ namespace Game.Entities
{
if (apply)
{
AddUnitFlag(UnitFlags.ImmuneToNpc);
SetUnitFlag(UnitFlags.ImmuneToNpc);
ValidateAttackersAndOwnTarget();
if (!keepCombat)
{
@@ -3221,7 +3224,7 @@ namespace Game.Entities
public virtual void SetPvP(bool state)
{
if (state)
AddPvpFlag(UnitPVPStateFlags.PvP);
SetPvpFlag(UnitPVPStateFlags.PvP);
else
RemovePvpFlag(UnitPVPStateFlags.PvP);
}
Source/Game/Entities/Vehicle.cs
+2 -2
View File
@@ -55,7 +55,7 @@ namespace Game.Entities
// Set or remove correct flags based on available seats. Will overwrite db data (if wrong).
if (UsableSeatNum != 0)
_me.AddNpcFlag(_me.IsTypeId(TypeId.Player) ? NPCFlags.PlayerVehicle : NPCFlags.SpellClick);
_me.SetNpcFlag(_me.IsTypeId(TypeId.Player) ? NPCFlags.PlayerVehicle : NPCFlags.SpellClick);
else
_me.RemoveNpcFlag(_me.IsTypeId(TypeId.Player) ? NPCFlags.PlayerVehicle : NPCFlags.SpellClick);
@@ -367,7 +367,7 @@ namespace Game.Entities
unit.GetName(), _me.GetEntry(), _vehicleInfo.Id, _me.GetGUID().ToString(), seat.Key);
if (seat.Value.SeatInfo.CanEnterOrExit() && ++UsableSeatNum != 0)
_me.AddNpcFlag(_me.IsTypeId(TypeId.Player) ? NPCFlags.PlayerVehicle : NPCFlags.SpellClick);
_me.SetNpcFlag(_me.IsTypeId(TypeId.Player) ? NPCFlags.PlayerVehicle : NPCFlags.SpellClick);
// Enable gravity for passenger when he did not have it active before entering the vehicle
if (seat.Value.SeatInfo.HasFlag(VehicleSeatFlags.DisableGravity) && !seat.Value.Passenger.IsGravityDisabled)