Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
Update GameTicker.Spawning.cs
Browse files Browse the repository at this point in the history
  • Loading branch information
Zekins3366 authored Mar 27, 2024
1 parent 7786253 commit 6cfb70c
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Content.Server/GameTicking/GameTicker.Spawning.cs
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,12 @@ private void SpawnPlayer(ICommonSession player, HumanoidCharacterProfile charact
Loc.GetString(
"latejoin-arrival-announcement",
("character", MetaData(mob).EntityName),
("gender", character.Gender), // Corvax-LastnameGender
("job", CultureInfo.CurrentCulture.TextInfo.ToTitleCase(jobName))
), Loc.GetString("latejoin-arrival-sender"),
playDefaultSound: false);
}

// who tf is perma oWo
if (player.UserId == new Guid("{e887eb93-f503-4b65-95b6-2f282c014192}"))
{
EntityManager.AddComponent<OwOAccentComponent>(mob);
Expand Down Expand Up @@ -339,6 +339,7 @@ public void SpawnObserver(ICommonSession player)
_metaData.SetEntityName(ghost, name);
_ghost.SetCanReturnToBody(ghost, false);
_mind.TransferTo(mind.Value, ghost);
_adminLogger.Add(LogType.LateJoin, LogImpact.Low, $"{player.Name} late joined the round as an Observer with {ToPrettyString(ghost):entity}.");
}

#region Mob Spawning Helpers
Expand Down Expand Up @@ -386,7 +387,7 @@ public EntityCoordinates GetObserverSpawnPoint()
// Ideally engine would just spawn them on grid directly I guess? Right now grid traversal is handling it during
// update which means we need to add a hack somewhere around it.
var spawn = _robustRandom.Pick(_possiblePositions);
var toMap = spawn.ToMap(EntityManager);
var toMap = spawn.ToMap(EntityManager, _transform);

if (_mapManager.TryFindGridAt(toMap, out var gridUid, out _))
{
Expand Down

0 comments on commit 6cfb70c

Please sign in to comment.