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

Shared IMap/Map class removal (#467)

Browse Source 
* Fully removed the Map and IMap class.

* Submodule update to sibling engine commit.
This commit is contained in:
Acruid
2019-11-26 14:16:36 -08:00
committed by Pieter-Jan Briers
parent 9cfa0d447a
commit d549c44f95
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -347,7 +347,7 @@ namespace Content.Server.GameObjects.EntitySystems
}
// Verify player is on the same map as the entity he clicked on
if (_mapManager.GetGrid(coordinates.GridID).ParentMap.Index != playerTransform.MapID)
if (_mapManager.GetGrid(coordinates.GridID).ParentMapId != playerTransform.MapID)
{
Logger.WarningS("system.interaction",
$"Player named {player.Name} clicked on a map he isn't located on");
@@ -750,7 +750,7 @@ namespace Content.Server.GameObjects.EntitySystems
private void DoAttack(IEntity player, GridCoordinates coordinates, EntityUid uid)
{
// Verify player is on the same map as the entity he clicked on
if (_mapManager.GetGrid(coordinates.GridID).ParentMap.Index != player.Transform.MapID)
if (_mapManager.GetGrid(coordinates.GridID).ParentMapId != player.Transform.MapID)
{
Logger.WarningS("system.interaction",
$"Player named {player.Name} clicked on a map he isn't located on");