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

Core/Map: Change all foreach loops over objects in maps to for loops, Fixes Collection was modified enumeration operation may not execute

Browse Source
This commit is contained in:
hondacrx
2021-01-03 14:58:09 -05:00
parent f929746c3d
commit d605ebca38
6 changed files with 320 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.Fields.cs
+19 -16
View File
@@ -596,53 +596,56 @@ namespace Game.Entities
public override void Visit(IList<Player> objs)
{
foreach (var target in objs)
for (var i = 0; i < objs.Count; ++i)
{
if (!IsInRangeHelper(target))
Player player = objs[i];
if (!IsInRangeHelper(player))
continue;
// Send packet to all who are sharing the player's vision
if (target.HasSharedVision())
if (player.HasSharedVision())
{
foreach (var visionTarget in target.GetSharedVisionList())
if (visionTarget.seerView == target)
foreach (var visionTarget in player.GetSharedVisionList())
if (visionTarget.seerView == player)
SendPacket(visionTarget);
}
if (target.seerView == target || target.GetVehicle())
SendPacket(target);
if (player.seerView == player || player.GetVehicle())
SendPacket(player);
}
}
public override void Visit(IList<Creature> objs)
{
foreach (var target in objs)
for (var i = 0; i < objs.Count; ++i)
{
if (!IsInRangeHelper(target))
Creature creature = objs[i];
if (!IsInRangeHelper(creature))
continue;
// Send packet to all who are sharing the creature's vision
if (target.HasSharedVision())
if (creature.HasSharedVision())
{
foreach (var visionTarget in target.GetSharedVisionList())
if (visionTarget.seerView == target)
foreach (var visionTarget in creature.GetSharedVisionList())
if (visionTarget.seerView == creature)
SendPacket(visionTarget);
}
}
}
public override void Visit(IList<DynamicObject> objs)
{
foreach (var target in objs)
for (var i = 0; i < objs.Count; ++i)
{
if (!IsInRangeHelper(target))
DynamicObject dynamicObject = objs[i];
if (!IsInRangeHelper(dynamicObject))
continue;
Unit caster = target.GetCaster();
Unit caster = dynamicObject.GetCaster();
if (caster)
{
// Send packet back to the caster if the caster has vision of dynamic object
Player player = caster.ToPlayer();
if (player && player.seerView == target)
if (player && player.seerView == dynamicObject)
SendPacket(player);
}
}