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
2024-03-19 17:21:32 -04:00
parent 5237c49b77
commit 1e421b9f53
71 changed files with 337 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Maps/Map.cs
+6 -6
View File
@@ -422,7 +422,7 @@ namespace Game.Maps
vignetteUpdate.Removed.Add(vignette.Guid);
vignetteUpdate.Write();
if (vignette.Data.GetFlags().HasFlag(VignetteFlags.ZoneInfiniteAOI))
if (vignette.Data.HasFlag(VignetteFlags.ZoneInfiniteAOI))
{
foreach (var player in GetPlayers())
if (player.GetZoneId() == vignette.ZoneID)
@@ -1739,7 +1739,7 @@ namespace Game.Maps
}
// players are only allowed to enter 10 instances per hour
if (!entry.GetFlags2().HasFlag(MapFlags2.IgnoreInstanceFarmLimit) && entry.IsDungeon() && !player.CheckInstanceCount(instanceIdToCheck) && !player.IsDead())
if (!entry.HasFlag(MapFlags2.IgnoreInstanceFarmLimit) && entry.IsDungeon() && !player.CheckInstanceCount(instanceIdToCheck) && !player.IsDead())
return new TransferAbortParams(TransferAbortReason.TooManyInstances);
}
@@ -3344,7 +3344,7 @@ namespace Game.Maps
public bool IsHeroic()
{
DifficultyRecord difficulty = CliDB.DifficultyStorage.LookupByKey(i_spawnMode);
if (difficulty != null && difficulty.Flags.HasFlag(DifficultyFlags.DisplayHeroic))
if (difficulty != null && difficulty.HasFlag(DifficultyFlags.DisplayHeroic))
return true;
// compatibility purposes of old difficulties
@@ -3359,7 +3359,7 @@ namespace Game.Maps
{
var difficulty = CliDB.DifficultyStorage.LookupByKey(i_spawnMode);
if (difficulty != null)
return difficulty.Flags.HasFlag(DifficultyFlags.DisplayMythic);
return difficulty.HasFlag(DifficultyFlags.DisplayMythic);
return false;
}
@@ -3738,7 +3738,7 @@ namespace Game.Maps
mask = UnitTypeMask.Minion;
break;
default:
if (properties.GetFlags().HasFlag(SummonPropertiesFlags.JoinSummonerSpawnGroup)) // Mirror Image, Summon Gargoyle
if (properties.HasFlag(SummonPropertiesFlags.JoinSummonerSpawnGroup)) // Mirror Image, Summon Gargoyle
mask = UnitTypeMask.Guardian;
break;
}
@@ -3788,7 +3788,7 @@ namespace Game.Maps
}
// Set the summon to the summoner's phase
if (summoner != null && !(properties != null && properties.GetFlags().HasFlag(SummonPropertiesFlags.IgnoreSummonerPhase)))
if (summoner != null && !(properties != null && properties.HasFlag(SummonPropertiesFlags.IgnoreSummonerPhase)))
PhasingHandler.InheritPhaseShift(summon, summoner);
summon.SetCreatedBySpell(spellId);
Source/Game/Maps/TerrainManager.cs
+3 -3
View File
@@ -506,7 +506,7 @@ namespace Game.Maps
data.AreaId = gridAreaId;
var areaEntry1 = CliDB.AreaTableStorage.LookupByKey(data.AreaId);
if (areaEntry1 != null)
data.outdoors = areaEntry1.GetFlags().HasFlag(AreaFlags.ForceOutdoors) || !areaEntry1.GetFlags().HasFlag(AreaFlags.ForceIndoors);
data.outdoors = areaEntry1.HasFlag(AreaFlags.ForceOutdoors) || !areaEntry1.HasFlag(AreaFlags.ForceIndoors);
}
if (data.AreaId == 0)
@@ -790,7 +790,7 @@ namespace Game.Maps
uint areaId = GetAreaId(phaseShift, mapId, x, y, z, dynamicMapTree);
var area = CliDB.AreaTableStorage.LookupByKey(areaId);
if (area != null)
if (area.ParentAreaID != 0 && area.GetFlags().HasFlag(AreaFlags.IsSubzone))
if (area.ParentAreaID != 0 && area.HasFlag(AreaFlags.IsSubzone))
return area.ParentAreaID;
return areaId;
@@ -803,7 +803,7 @@ namespace Game.Maps
areaid = zoneid = GetAreaId(phaseShift, mapId, x, y, z, dynamicMapTree);
var area = CliDB.AreaTableStorage.LookupByKey(areaid);
if (area != null)
if (area.ParentAreaID != 0 && area.GetFlags().HasFlag(AreaFlags.IsSubzone))
if (area.ParentAreaID != 0 && area.HasFlag(AreaFlags.IsSubzone))
zoneid = area.ParentAreaID;
}
Source/Game/Maps/TransportManager.cs
+2 -2
View File
@@ -338,9 +338,9 @@ namespace Game.Maps
transport.PathLegs.Add(leg);
}
prevNodeWasTeleport = node.Flags.HasFlag(TaxiPathNodeFlags.Teleport);
prevNodeWasTeleport = node.HasFlag(TaxiPathNodeFlags.Teleport);
pathPoints.Add(node);
if (node.Flags.HasFlag(TaxiPathNodeFlags.Stop))
if (node.HasFlag(TaxiPathNodeFlags.Stop))
pauses.Add(node);
if (node.ArrivalEventID != 0 || node.DepartureEventID != 0)