Fix shooting (#417)

* Fix shooting

* Fix 2
This commit is contained in:
Aviu00
2023-09-19 16:51:51 +09:00
committed by Aviu00
parent 00389ed16e
commit e4df61c25b

View File

@@ -169,8 +169,20 @@ public sealed partial class GunSystem : SharedGunSystem
return;
}
// Define target coordinates relative to gun entity, so that network latency on moving grids doesn't fuck up the target location.
var coordinates = EntityCoordinates.FromMap(entity, mousePos, TransformSystem, EntityManager);
// WD EDIT START
EntityCoordinates coordinates;
if (MapManager.TryFindGridAt(mousePos, out var grid, out _) ||
MapManager.TryFindGridAt(Transform(entity).MapPosition, out grid, out _))
{
coordinates = EntityCoordinates.FromMap(grid, mousePos, TransformSystem, EntityManager);
}
else
{
coordinates = EntityCoordinates.FromMap(MapManager.GetMapEntityId(mousePos.MapId), mousePos,
TransformSystem, EntityManager);
}
// WD EDIT END
Log.Debug($"Sending shoot request tick {Timing.CurTick} / {Timing.CurTime}");