Makes more things queue delete to prevent physics collision callback issues.
This commit is contained in:
@@ -269,7 +269,7 @@ namespace Content.Server.GameObjects.Components.Atmos
|
||||
|
||||
Owner.SpawnExplosion((int) (range * 0.25f), (int) (range * 0.5f), (int) (range * 1.5f), 1);
|
||||
|
||||
Owner.Delete();
|
||||
Owner.QueueDelete();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -283,7 +283,7 @@ namespace Content.Server.GameObjects.Components.Atmos
|
||||
SoundSystem.Play(Filter.Pvs(Owner), "Audio/Effects/spray.ogg", Owner.Transform.Coordinates,
|
||||
AudioHelpers.WithVariation(0.125f));
|
||||
|
||||
Owner.Delete();
|
||||
Owner.QueueDelete();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ namespace Content.Server.GameObjects.Components.Botany
|
||||
plank.RandomOffset(0.25f);
|
||||
}
|
||||
|
||||
Owner.Delete();
|
||||
Owner.QueueDelete();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -655,7 +655,7 @@ namespace Content.Server.GameObjects.Components.Botany
|
||||
if (seeds.Seed == null)
|
||||
{
|
||||
user.PopupMessageCursor(Loc.GetString("The packet seems to be empty. You throw it away."));
|
||||
usingItem.Delete();
|
||||
usingItem.QueueDelete();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -667,7 +667,7 @@ namespace Content.Server.GameObjects.Components.Botany
|
||||
Health = Seed.Endurance;
|
||||
_lastCycle = _gameTiming.CurTime;
|
||||
|
||||
usingItem.Delete();
|
||||
usingItem.QueueDelete();
|
||||
|
||||
CheckLevelSanity();
|
||||
UpdateSprite();
|
||||
@@ -799,7 +799,7 @@ namespace Content.Server.GameObjects.Components.Botany
|
||||
ForceUpdateByExternalCause();
|
||||
}
|
||||
|
||||
usingItem.Delete();
|
||||
usingItem.QueueDelete();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace Content.Server.GameObjects.Components.Botany
|
||||
{
|
||||
eventArgs.User.PopupMessageCursor(Loc.GetString("You extract some seeds from the {0}.", eventArgs.Using.Name));
|
||||
|
||||
eventArgs.Using.Delete();
|
||||
eventArgs.Using.QueueDelete();
|
||||
|
||||
var random = _random.Next(_minSeeds, _maxSeeds);
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
|
||||
{
|
||||
Owner.EntityManager.SpawnEntity(_foamedMetalPrototype, Owner.Transform.Coordinates);
|
||||
}
|
||||
Owner.Delete();
|
||||
Owner.QueueDelete();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -108,7 +108,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
|
||||
|
||||
trueTarget.PopupMessage(user, Loc.GetString("You swallow the pill."));
|
||||
|
||||
Owner.Delete();
|
||||
Owner.QueueDelete();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
|
||||
solution.Solution.SpillAt(Owner, "PuddleSmear", false);
|
||||
}
|
||||
|
||||
Owner.Delete();
|
||||
Owner.QueueDelete();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace Content.Server.GameObjects.Components.Recycling
|
||||
|
||||
}
|
||||
|
||||
Owner.Delete();
|
||||
Owner.QueueDelete();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user