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

Misc fixes

Browse Source
This commit is contained in:
hondacrx
2022-07-23 22:48:56 -04:00
parent 732609fd87
commit 2b74effdd8
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Object/ObjectGuid.cs
+1 -1
View File
@@ -552,7 +552,7 @@ namespace Game.Entities
public static ObjectGuid CreateWorldLayer(uint arg1, ushort arg2, byte arg3, uint arg4) public static ObjectGuid CreateWorldLayer(uint arg1, ushort arg2, byte arg3, uint arg4)
{ {
return new ObjectGuid((ulong)(((ulong)HighGuid.WorldLayer << 58) | ((ulong)(arg1 & 0xFFFFFFFF) << 10) | (ulong)(arg2 & 0x1FF)), (ulong)(((ulong)(arg3 & 0xFF) << 24) | (ulong)(arg4 & 0x7FFFFF))); return new ObjectGuid((ulong)(((ulong)HighGuid.WorldLayer << 58) | ((ulong)(arg1 & 0xFFFFFFFF) << 10) | (ulong)(arg2 & 0x1FFu)), (ulong)(((ulong)(arg3 & 0xFF) << 24) | (ulong)(arg4 & 0x7FFFFF)));
} }
static uint GetRealmIdForObjectGuid(uint realmId) static uint GetRealmIdForObjectGuid(uint realmId)
Source/Game/Guilds/GuildManager.cs
-1
View File
@@ -502,7 +502,6 @@ namespace Game
public List<GuildReward> GetGuildRewards() { return guildRewards; } public List<GuildReward> GetGuildRewards() { return guildRewards; }
uint NextGuildId; uint NextGuildId;
Dictionary<ulong, Guild> GuildStore = new(); Dictionary<ulong, Guild> GuildStore = new();
List<GuildReward> guildRewards = new(); List<GuildReward> guildRewards = new();
Source/Game/Phasing/PhasingHandler.cs
+1 -1
View File
@@ -639,7 +639,7 @@ namespace Game
{ {
StringBuilder uiWorldMapAreaIdSwaps = new(); StringBuilder uiWorldMapAreaIdSwaps = new();
foreach (var uiWorldMapAreaIdSwap in phaseShift.UiMapPhaseIds) foreach (var uiWorldMapAreaIdSwap in phaseShift.UiMapPhaseIds)
uiWorldMapAreaIdSwaps.Append(uiWorldMapAreaIdSwap.Key + ',' + ' '); uiWorldMapAreaIdSwaps.AppendFormat($"{uiWorldMapAreaIdSwap.Key}, ");
chat.SendSysMessage(CypherStrings.PhaseshiftUiWorldMapAreaSwaps, uiWorldMapAreaIdSwaps.ToString()); chat.SendSysMessage(CypherStrings.PhaseshiftUiWorldMapAreaSwaps, uiWorldMapAreaIdSwaps.ToString());
} }
Source/Scripts/Argus/AntorusTheBurningThrone/GarothiWorldbreaker.cs
+3 -4
View File
@@ -377,9 +377,8 @@ namespace Scripts.Argus.AntorusTheBurningThrone.GarothiWorldbreaker
break; break;
case EventIds.SurgingFel: case EventIds.SurgingFel:
{ {
var guids = _surgingFelDummyGuids; _surgingFelDummyGuids.Remove(_lastSurgingFelDummyGuid);
guids.Remove(_lastSurgingFelDummyGuid); _lastSurgingFelDummyGuid = _surgingFelDummyGuids.SelectRandom();
_lastSurgingFelDummyGuid = guids.SelectRandom();
Creature dummy = ObjectAccessor.GetCreature(me, _lastSurgingFelDummyGuid); Creature dummy = ObjectAccessor.GetCreature(me, _lastSurgingFelDummyGuid);
if (dummy) if (dummy)
dummy.CastSpell(dummy, SpellIds.SurgingFelAreaTrigger); dummy.CastSpell(dummy, SpellIds.SurgingFelAreaTrigger);
@@ -404,7 +403,7 @@ namespace Scripts.Argus.AntorusTheBurningThrone.GarothiWorldbreaker
uint _lastCanonEntry; uint _lastCanonEntry;
bool _castEradication; bool _castEradication;
ObjectGuid _lastSurgingFelDummyGuid; ObjectGuid _lastSurgingFelDummyGuid;
List<ObjectGuid> _surgingFelDummyGuids; List<ObjectGuid> _surgingFelDummyGuids = new();
void CleanupEncounter() void CleanupEncounter()
{ {