epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "In RemoveCellsFromPlayerShroud, don't call RemoveSource unless required."

Browse Source 
This reverts commit 86b9227577.

This commit relied on the relationship not changing, but when a player is defeated their relationship can change due to becoming a spectator. This can cause a crash if the shroud is not removed. Revert the commit to resolve this crash.
This commit is contained in:
RoosterDragon
2025-11-22 13:06:24 +00:00
committed by Gustas Kažukauskas
parent 89a4823a83
commit ba632fbf8b
4 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Effects/RevealShroudEffect.cs
View File

@@ -49,13 +49,7 @@ namespace OpenRA.Mods.Common.Effects
p.Shroud.AddSource(this, sourceType, uv); p.Shroud.AddSource(this, sourceType, uv);
} }
void RemoveCellsFromPlayerShroud(Player p) void RemoveCellsFromPlayerShroud(Player p) { p.Shroud.RemoveSource(this); }
{
if (!validStances.HasRelationship(player.RelationshipWith(p)))
return;
p.Shroud.RemoveSource(this);
}
PPos[] ProjectedCells(World world) PPos[] ProjectedCells(World world)
{ {

8
OpenRA.Mods.Common/Traits/CreatesShroud.cs
View File

@@ -49,13 +49,7 @@ namespace OpenRA.Mods.Common.Traits
p.Shroud.AddSource(this, Shroud.SourceType.Shroud, uv); p.Shroud.AddSource(this, Shroud.SourceType.Shroud, uv);
} }
protected override void RemoveCellsFromPlayerShroud(Actor self, Player p) protected override void RemoveCellsFromPlayerShroud(Actor self, Player p) { p.Shroud.RemoveSource(this); }
{
if (!info.ValidRelationships.HasRelationship(self.Owner.RelationshipWith(p)))
return;
p.Shroud.RemoveSource(this);
}
public override WDist Range public override WDist Range
{ {

16
OpenRA.Mods.Common/Traits/RevealsMap.cs
View File

@@ -44,13 +44,7 @@ namespace OpenRA.Mods.Common.Traits
p.Shroud.AddSource(this, type, uv); p.Shroud.AddSource(this, type, uv);
} }
protected void RemoveCellsFromPlayerShroud(Actor self, Player p) protected void RemoveCellsFromPlayerShroud(Player p) { p.Shroud.RemoveSource(this); }
{
if (!Info.ValidRelationships.HasRelationship(self.Owner.RelationshipWith(p)))
return;
p.Shroud.RemoveSource(this);
}
protected PPos[] ProjectedCells(Actor self) protected PPos[] ProjectedCells(Actor self)
{ {
@@ -64,7 +58,7 @@ namespace OpenRA.Mods.Common.Traits
var cells = ProjectedCells(self); var cells = ProjectedCells(self);
foreach (var player in self.World.Players) foreach (var player in self.World.Players)
{ {
RemoveCellsFromPlayerShroud(self, player); RemoveCellsFromPlayerShroud(player);
AddCellsToPlayerShroud(self, player, cells); AddCellsToPlayerShroud(self, player, cells);
} }
} }
@@ -73,13 +67,13 @@ namespace OpenRA.Mods.Common.Traits
void INotifyActorDisposing.Disposing(Actor self) void INotifyActorDisposing.Disposing(Actor self)
{ {
foreach (var player in self.World.Players) foreach (var player in self.World.Players)
RemoveCellsFromPlayerShroud(self, player); RemoveCellsFromPlayerShroud(player);
} }
void INotifyKilled.Killed(Actor self, AttackInfo e) void INotifyKilled.Killed(Actor self, AttackInfo e)
{ {
foreach (var player in self.World.Players) foreach (var player in self.World.Players)
RemoveCellsFromPlayerShroud(self, player); RemoveCellsFromPlayerShroud(player);
} }
protected override void TraitEnabled(Actor self) protected override void TraitEnabled(Actor self)
@@ -92,7 +86,7 @@ namespace OpenRA.Mods.Common.Traits
protected override void TraitDisabled(Actor self) protected override void TraitDisabled(Actor self)
{ {
foreach (var player in self.World.Players) foreach (var player in self.World.Players)
RemoveCellsFromPlayerShroud(self, player); RemoveCellsFromPlayerShroud(player);
} }
} }
} }

8
OpenRA.Mods.Common/Traits/RevealsShroud.cs
View File

@@ -55,13 +55,7 @@ namespace OpenRA.Mods.Common.Traits
p.Shroud.AddSource(this, type, uv); p.Shroud.AddSource(this, type, uv);
} }
protected override void RemoveCellsFromPlayerShroud(Actor self, Player p) protected override void RemoveCellsFromPlayerShroud(Actor self, Player p) { p.Shroud.RemoveSource(this); }
{
if (!info.ValidRelationships.HasRelationship(self.Owner.RelationshipWith(p)))
return;
p.Shroud.RemoveSource(this);
}
public override WDist Range public override WDist Range
{ {