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

Removal of TrySpawn* methods, update submodule.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2019-07-07 22:24:44 +02:00
parent 8ff4c22f42
commit 558f6ab8a5
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/GameObjects/Components/Construction/ConstructorComponent.cs
View File

@@ -63,7 +63,7 @@ namespace Content.Client.GameObjects.Components.Construction
public void SpawnGhost(ConstructionPrototype prototype, GridCoordinates loc, Direction dir) public void SpawnGhost(ConstructionPrototype prototype, GridCoordinates loc, Direction dir)
{ {
var entMgr = IoCManager.Resolve<IClientEntityManager>(); var entMgr = IoCManager.Resolve<IClientEntityManager>();
var ghost = entMgr.ForceSpawnEntityAt("constructionghost", loc); var ghost = entMgr.SpawnEntityAt("constructionghost", loc);
var comp = ghost.GetComponent<ConstructionGhostComponent>(); var comp = ghost.GetComponent<ConstructionGhostComponent>();
comp.Prototype = prototype; comp.Prototype = prototype;
comp.Master = this; comp.Master = this;

2
Content.Server/Administration/AGhost.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Server.Administration
else else
{ {
var entityManager = IoCManager.Resolve<IEntityManager>(); var entityManager = IoCManager.Resolve<IEntityManager>();
var ghost = entityManager.ForceSpawnEntityAt("AdminObserver", var ghost = entityManager.SpawnEntityAt("AdminObserver",
player.AttachedEntity.Transform.GridPosition); player.AttachedEntity.Transform.GridPosition);
mind.Visit(ghost); mind.Visit(ghost);

2
Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs
View File

@@ -51,7 +51,7 @@ namespace Content.Server.GameObjects.Components.Construction
{ {
// Oh boy we get to finish construction! // Oh boy we get to finish construction!
var entMgr = IoCManager.Resolve<IServerEntityManager>(); var entMgr = IoCManager.Resolve<IServerEntityManager>();
var ent = entMgr.ForceSpawnEntityAt(Prototype.Result, Transform.GridPosition); var ent = entMgr.SpawnEntityAt(Prototype.Result, Transform.GridPosition);
ent.GetComponent<ITransformComponent>().LocalRotation = Transform.LocalRotation; ent.GetComponent<ITransformComponent>().LocalRotation = Transform.LocalRotation;
Owner.Delete(); Owner.Delete();
return true; return true;

4
Content.Server/GameObjects/Components/Construction/ConstructorComponent.cs
View File

@@ -83,12 +83,12 @@ namespace Content.Server.GameObjects.Components.Construction
if (prototype.Stages.Count == 2) if (prototype.Stages.Count == 2)
{ {
// Exactly 2 stages, so don't make an intermediate frame. // Exactly 2 stages, so don't make an intermediate frame.
var ent = _serverEntityManager.ForceSpawnEntityAt(prototype.Result, loc); var ent = _serverEntityManager.SpawnEntityAt(prototype.Result, loc);
ent.Transform.LocalRotation = angle; ent.Transform.LocalRotation = angle;
} }
else else
{ {
var frame = _serverEntityManager.ForceSpawnEntityAt("structureconstructionframe", loc); var frame = _serverEntityManager.SpawnEntityAt("structureconstructionframe", loc);
var construction = frame.GetComponent<ConstructionComponent>(); var construction = frame.GetComponent<ConstructionComponent>();
construction.Init(prototype); construction.Init(prototype);
frame.Transform.LocalRotation = angle; frame.Transform.LocalRotation = angle;

2
Content.Server/GameObjects/Components/Damage/DestructibleComponent.cs
View File

@@ -96,7 +96,7 @@ namespace Content.Server.GameObjects.Components.Destructible
{ {
if (!string.IsNullOrWhiteSpace(spawnOnDestroy) && eventArgs.IsSpawnWreck) if (!string.IsNullOrWhiteSpace(spawnOnDestroy) && eventArgs.IsSpawnWreck)
{ {
Owner.EntityManager.TrySpawnEntityAt(spawnOnDestroy, Owner.Transform.GridPosition, out var wreck); Owner.EntityManager.SpawnEntityAt(spawnOnDestroy, Owner.Transform.GridPosition);
} }
} }
} }

2
Content.Server/GameObjects/Components/Research/LatheComponent.cs
View File

@@ -79,7 +79,7 @@ namespace Content.Server.GameObjects.Components.Research
{ {
Producing = false; Producing = false;
_producingRecipe = null; _producingRecipe = null;
Owner.EntityManager.TrySpawnEntityAt(recipe.Result, Owner.Transform.GridPosition, out var entity); Owner.EntityManager.SpawnEntityAt(recipe.Result, Owner.Transform.GridPosition);
_userInterface.SendMessage(new LatheStoppedProducingRecipeMessage()); _userInterface.SendMessage(new LatheStoppedProducingRecipeMessage());
}); });

2
Content.Server/GameObjects/EntitySystems/HandsSystem.cs
View File

@@ -143,7 +143,7 @@ namespace Content.Server.GameObjects.EntitySystems
else else
{ {
stackComp.Use(1); stackComp.Use(1);
throwEnt = throwEnt.EntityManager.ForceSpawnEntityAt(throwEnt.Prototype.ID, plyEnt.Transform.GridPosition); throwEnt = throwEnt.EntityManager.SpawnEntityAt(throwEnt.Prototype.ID, plyEnt.Transform.GridPosition);
} }
if (!throwEnt.TryGetComponent(out CollidableComponent colComp)) if (!throwEnt.TryGetComponent(out CollidableComponent colComp))

4
Content.Server/GameTicking/GameTicker.cs
View File

@@ -261,7 +261,7 @@ namespace Content.Server.GameTicking
private IEntity _spawnPlayerMob() private IEntity _spawnPlayerMob()
{ {
var entity = _entityManager.ForceSpawnEntityAt(PlayerPrototypeName, _getLateJoinSpawnPoint()); var entity = _entityManager.SpawnEntityAt(PlayerPrototypeName, _getLateJoinSpawnPoint());
var shoes = _entityManager.SpawnEntity("ShoesItem"); var shoes = _entityManager.SpawnEntity("ShoesItem");
var uniform = _entityManager.SpawnEntity("UniformAssistant"); var uniform = _entityManager.SpawnEntity("UniformAssistant");
if (entity.TryGetComponent(out InventoryComponent inventory)) if (entity.TryGetComponent(out InventoryComponent inventory))
@@ -275,7 +275,7 @@ namespace Content.Server.GameTicking
private IEntity _spawnObserverMob() private IEntity _spawnObserverMob()
{ {
return _entityManager.ForceSpawnEntityAt(ObserverPrototypeName, _getLateJoinSpawnPoint()); return _entityManager.SpawnEntityAt(ObserverPrototypeName, _getLateJoinSpawnPoint());
} }
private GridCoordinates _getLateJoinSpawnPoint() private GridCoordinates _getLateJoinSpawnPoint()

2
RobustToolbox

Submodule RobustToolbox updated: 78c393aac5...c9906b15d3