Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Inline QueueDelete

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:43:22 +01:00
parent e3227546b3
commit c2e6da1e54
18 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Botany/Components/LogComponent.cs
View File

@@ -27,7 +27,7 @@ namespace Content.Server.Botany.Components
plank.RandomOffset(0.25f);
}
Owner.QueueDelete();
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity(Owner.Uid);
return true;
}

6
Content.Server/Botany/Components/PlantHolderComponent.cs
View File

@@ -661,7 +661,7 @@ namespace Content.Server.Botany.Components
if (seeds.Seed == null)
{
user.PopupMessageCursor(Loc.GetString("plant-holder-component-empty-seed-packet-message"));
usingItem.QueueDelete();
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity(usingItem.Uid);
return false;
}
@@ -675,7 +675,7 @@ namespace Content.Server.Botany.Components
Health = Seed.Endurance;
_lastCycle = _gameTiming.CurTime;
usingItem.QueueDelete();
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity(usingItem.Uid);
CheckLevelSanity();
UpdateSprite();
@@ -823,7 +823,7 @@ namespace Content.Server.Botany.Components
ForceUpdateByExternalCause();
}
usingItem.QueueDelete();
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity(usingItem.Uid);
return true;
}

2
Content.Server/Botany/Components/SeedExtractorComponent.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Server.Botany.Components
{
eventArgs.User.PopupMessageCursor(Loc.GetString("seed-extractor-component-interact-message",("name", eventArgs.Using.Name)));
eventArgs.Using.QueueDelete();
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity(eventArgs.Using.Uid);
var random = _random.Next(_minSeeds, _maxSeeds);