tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nullspace map entity is created every time the client joins the server. This fixes #520.

Browse Source
This commit is contained in:
Acruid
2020-01-20 00:36:34 -08:00
parent 57c3f63a26
commit 7c562af0aa
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/EntryPoint.cs
View File

@@ -173,6 +173,11 @@ namespace Content.Client
{ {
_stateManager.RequestStateChange<GameScreen>(); _stateManager.RequestStateChange<GameScreen>();
}; };
_baseClient.PlayerJoinedServer += (sender, args) =>
{
IoCManager.Resolve<IMapManager>().CreateNewMapEntity(MapId.Nullspace);
};
} }
/// <summary> /// <summary>
@@ -217,7 +222,6 @@ namespace Content.Client
IoCManager.Resolve<IChatManager>().Initialize(); IoCManager.Resolve<IChatManager>().Initialize();
IoCManager.Resolve<ISandboxManager>().Initialize(); IoCManager.Resolve<ISandboxManager>().Initialize();
IoCManager.Resolve<IClientPreferencesManager>().Initialize(); IoCManager.Resolve<IClientPreferencesManager>().Initialize();
IoCManager.Resolve<IMapManager>().CreateNewMapEntity(MapId.Nullspace);
IoCManager.Resolve<IItemSlotManager>().Initialize(); IoCManager.Resolve<IItemSlotManager>().Initialize();
} }

4
Content.Client/Parallax/ParallaxOverlay.cs
View File

@@ -1,4 +1,4 @@
using Content.Client.Interfaces.Parallax; using Content.Client.Interfaces.Parallax;
using Robust.Client.Graphics; using Robust.Client.Graphics;
using Robust.Client.Graphics.Drawing; using Robust.Client.Graphics.Drawing;
using Robust.Client.Graphics.Overlays; using Robust.Client.Graphics.Overlays;
@@ -52,7 +52,7 @@ namespace Content.Client.Parallax
var screenHandle = (DrawingHandleScreen) handle; var screenHandle = (DrawingHandleScreen) handle;
var (sizeX, sizeY) = _parallaxTexture.Size; var (sizeX, sizeY) = _parallaxTexture.Size;
var (posX, posY) = _eyeManager.ScreenToWorld(Vector2.Zero).ToWorld(_mapManager).Position; var (posX, posY) = _eyeManager.ScreenToMap(Vector2.Zero).Position;
var (ox, oy) = (Vector2i) new Vector2(-posX / Slowness, posY / Slowness); var (ox, oy) = (Vector2i) new Vector2(-posX / Slowness, posY / Slowness);
ox = MathHelper.Mod(ox, sizeX); ox = MathHelper.Mod(ox, sizeX);
oy = MathHelper.Mod(oy, sizeY); oy = MathHelper.Mod(oy, sizeY);

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

@@ -322,11 +322,7 @@ namespace Content.Server.GameTicking
// FIXME: Actually, definitely. // FIXME: Actually, definitely.
entity.Delete(); entity.Delete();
// Delete all maps outside of nullspace. _mapManager.Restart();
foreach (var mapId in _mapManager.GetAllMapIds().ToList())
// TODO: Maybe something less naive here?
if (mapId != MapId.Nullspace)
_mapManager.DeleteMap(mapId);
// Delete the minds of everybody. // Delete the minds of everybody.
// TODO: Maybe move this into a separate manager? // TODO: Maybe move this into a separate manager?

2
RobustToolbox

Submodule RobustToolbox updated: ae85645e23...6249ae8d0d