Fix airlocks on some maps (#8363)
* Fix airlocks on some maps * Make MapsLoadableTest say the map that failed
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
using System.IO;
|
using System;
|
||||||
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
@@ -87,8 +88,22 @@ namespace Content.IntegrationTests.Tests
|
|||||||
server.Post(() =>
|
server.Post(() =>
|
||||||
{
|
{
|
||||||
var mapId = mapManager.CreateMap();
|
var mapId = mapManager.CreateMap();
|
||||||
|
try
|
||||||
|
{
|
||||||
mapLoader.LoadMap(mapId, rootedPath.ToString());
|
mapLoader.LoadMap(mapId, rootedPath.ToString());
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw new Exception($"Failed to load map {rootedPath}", ex);
|
||||||
|
}
|
||||||
|
try
|
||||||
|
{
|
||||||
mapManager.DeleteMap(mapId);
|
mapManager.DeleteMap(mapId);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw new Exception($"Failed to delete map {rootedPath}", ex);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
await server.WaitIdleAsync();
|
await server.WaitIdleAsync();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -677,6 +677,19 @@ entities:
|
|||||||
parent: 0
|
parent: 0
|
||||||
type: Transform
|
type: Transform
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
|
|||||||
@@ -114392,6 +114392,19 @@ entities:
|
|||||||
parent: 131
|
parent: 131
|
||||||
type: Transform
|
type: Transform
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
@@ -114428,6 +114441,19 @@ entities:
|
|||||||
parent: 131
|
parent: 131
|
||||||
type: Transform
|
type: Transform
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
@@ -114604,6 +114630,19 @@ entities:
|
|||||||
state: Opening
|
state: Opening
|
||||||
type: Door
|
type: Door
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
@@ -114623,6 +114662,19 @@ entities:
|
|||||||
state: Opening
|
state: Opening
|
||||||
type: Door
|
type: Door
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
@@ -137288,6 +137340,19 @@ entities:
|
|||||||
state: Opening
|
state: Opening
|
||||||
type: Door
|
type: Door
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
@@ -137308,6 +137373,19 @@ entities:
|
|||||||
state: Opening
|
state: Opening
|
||||||
type: Door
|
type: Door
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
@@ -137321,6 +137399,19 @@ entities:
|
|||||||
parent: 12173
|
parent: 12173
|
||||||
type: Transform
|
type: Transform
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
@@ -137334,6 +137425,19 @@ entities:
|
|||||||
parent: 12173
|
parent: 12173
|
||||||
type: Transform
|
type: Transform
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
@@ -142172,6 +142276,19 @@ entities:
|
|||||||
parent: 131
|
parent: 131
|
||||||
type: Transform
|
type: Transform
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
|
|||||||
@@ -1357,6 +1357,19 @@ entities:
|
|||||||
parent: 25
|
parent: 25
|
||||||
type: Transform
|
type: Transform
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
@@ -1618,6 +1631,19 @@ entities:
|
|||||||
parent: 25
|
parent: 25
|
||||||
type: Transform
|
type: Transform
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
@@ -3923,6 +3949,19 @@ entities:
|
|||||||
parent: 25
|
parent: 25
|
||||||
type: Transform
|
type: Transform
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
|
|||||||
@@ -7074,6 +7074,19 @@ entities:
|
|||||||
parent: 852
|
parent: 852
|
||||||
type: Transform
|
type: Transform
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
@@ -7131,6 +7144,19 @@ entities:
|
|||||||
parent: 852
|
parent: 852
|
||||||
type: Transform
|
type: Transform
|
||||||
- fixtures:
|
- fixtures:
|
||||||
|
- shape: !type:PolygonShape
|
||||||
|
vertices:
|
||||||
|
- 0.49,-0.49
|
||||||
|
- 0.49,0.49
|
||||||
|
- -0.49,0.49
|
||||||
|
- -0.49,-0.49
|
||||||
|
mask:
|
||||||
|
- Impassable
|
||||||
|
layer:
|
||||||
|
- Impassable
|
||||||
|
- ThrownItem
|
||||||
|
- Opaque
|
||||||
|
mass: 100
|
||||||
- shape: !type:PhysShapeCircle
|
- shape: !type:PhysShapeCircle
|
||||||
position: 0,-0.5
|
position: 0,-0.5
|
||||||
radius: 0.2
|
radius: 0.2
|
||||||
|
|||||||
Reference in New Issue
Block a user