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

Merge branch 'master' into 20-06-24-movement-prediction

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-06-24 12:04:06 +02:00
parent 5a5a3b8548 c7ef7e06d8
commit 6d4618e8be
8 changed files with 68 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs
View File

@@ -79,10 +79,9 @@ namespace Content.Client.GameObjects.EntitySystems
}
}
if (ev.LastPosition.HasValue)
// Entity is no longer valid, update around the last position it was at.
if (ev.LastPosition.HasValue && _mapManager.TryGetGrid(ev.LastPosition.Value.grid, out var grid))
{
// Entity is no longer valid, update around the last position it was at.
var grid = _mapManager.GetGrid(ev.LastPosition.Value.grid);
var pos = ev.LastPosition.Value.pos;
AddValidEntities(grid.GetSnapGridCell(pos + new MapIndices(1, 0), ev.Offset));

6
Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs
View File

@@ -60,7 +60,11 @@ namespace Content.Client.GameObjects.EntitySystems
private void HandleDirtyEvent(SubFloorHideDirtyEvent ev)
{
var grid = _mapManager.GetGrid(ev.Sender.Transform.GridID);
if (!_mapManager.TryGetGrid(ev.Sender.Transform.GridID, out var grid))
{
return;
}
var indices = grid.WorldToTile(ev.Sender.Transform.WorldPosition);
UpdateTile(grid, indices);
}