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

Core/Misc: Rename SetXXXFlags updatefield functions to ReplaceAllXXXFlags

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/4eba9786708dd3b22d9053c1a14eac7e6d03242e)
This commit is contained in:
hondacrx
2022-05-30 15:57:56 -04:00
parent 969ba4e348
commit f53c4cb009
23 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Chat/Commands/ModifyCommands.cs
+4 -4
View File
@@ -147,10 +147,10 @@ namespace Game.Chat
handler.SendSysMessage(CypherStrings.YouChangeFaction, target.GetGUID().ToString(), factionid, flag, npcflag, dyflag);
target.SetFaction(factionid);
target.SetUnitFlags((UnitFlags)flag);
target.SetNpcFlags((NPCFlags)(npcflag & 0xFFFFFFFF));
target.SetNpcFlags2((NPCFlags2)(npcflag >> 32));
target.SetDynamicFlags((UnitDynFlags)dyflag);
target.ReplaceAllUnitFlags((UnitFlags)flag);
target.ReplaceAllNpcFlags((NPCFlags)(npcflag & 0xFFFFFFFF));
target.ReplaceAllNpcFlags2((NPCFlags2)(npcflag >> 32));
target.ReplaceAllDynamicFlags((UnitDynFlags)dyflag);
return true;
}
Source/Game/Chat/Commands/NPCCommands.cs
+2 -2
View File
@@ -1131,8 +1131,8 @@ namespace Game.Chat
return false;
}
creature.SetNpcFlags(npcFlags);
creature.SetNpcFlags2(npcFlags2);
creature.ReplaceAllNpcFlags(npcFlags);
creature.ReplaceAllNpcFlags2(npcFlags2);
PreparedStatement stmt = DB.World.GetPreparedStatement(WorldStatements.UPD_CREATURE_NPCFLAG);
stmt.AddValue(0, (ulong)npcFlags | ((ulong)npcFlags2 << 32));
Source/Game/Chat/Commands/ResetCommands.cs
+2 -2
View File
@@ -79,9 +79,9 @@ namespace Game.Chat
if (player.GetShapeshiftForm() == ShapeShiftForm.None)
player.InitDisplayIds();
player.SetPvpFlags(UnitPVPStateFlags.PvP);
player.ReplaceAllPvpFlags(UnitPVPStateFlags.PvP);
player.SetUnitFlags(UnitFlags.PlayerControlled);
player.ReplaceAllUnitFlags(UnitFlags.PlayerControlled);
//-1 is default value
player.SetWatchedFactionIndex(0xFFFFFFFF);