diff --git a/build.gradle b/build.gradle index 4781c26bd0..be29ec8f77 100644 --- a/build.gradle +++ b/build.gradle @@ -429,6 +429,7 @@ project(":tests"){ test{ //fork every test so mods don't interact with each other forkEvery = 1 + jvmArgs = ["-XX:+HeapDumpOnOutOfMemoryError"] useJUnitPlatform() workingDir = new File("../core/assets") testLogging{ diff --git a/core/assets/maps/serpulo/hidden/150.msav b/core/assets/maps/serpulo/hidden/150.msav new file mode 100644 index 0000000000..c821f12c2b Binary files /dev/null and b/core/assets/maps/serpulo/hidden/150.msav differ diff --git a/core/assets/maps/serpulo/hidden/247.msav b/core/assets/maps/serpulo/hidden/247.msav new file mode 100644 index 0000000000..3741df7b16 Binary files /dev/null and b/core/assets/maps/serpulo/hidden/247.msav differ diff --git a/core/src/mindustry/maps/SectorSubmissions.java b/core/src/mindustry/maps/SectorSubmissions.java index 1d2d4705df..0027686f40 100644 --- a/core/src/mindustry/maps/SectorSubmissions.java +++ b/core/src/mindustry/maps/SectorSubmissions.java @@ -72,6 +72,8 @@ public class SectorSubmissions{ registerSerpuloSector(103, "enwyz", "https://discord.com/channels/391020510269669376/1379926839559979030/1429203869514207255"); registerSerpuloSector(237, "Chocomint", "https://discord.com/channels/391020510269669376/1379926929636851812/1474447354982563840"); registerSerpuloSector(138, "Lilith", "https://discord.com/channels/391020510269669376/1379926873152164004/1470268689201889464"); + registerSerpuloSector(150, "Jamespire", "https://discord.com/channels/391020510269669376/1379926876457537547/1484013941477609543"); + registerSerpuloSector(247, "Locla^Glass", "https://discord.com/channels/391020510269669376/1379926976361533752/1431827990295220266"); /* UNUSED SECTORS: registerHiddenSectors(serpulo, diff --git a/tests/src/test/java/ApplicationTests.java b/tests/src/test/java/ApplicationTests.java index 5ea8e47422..abd69fb77d 100644 --- a/tests/src/test/java/ApplicationTests.java +++ b/tests/src/test/java/ApplicationTests.java @@ -904,6 +904,8 @@ public class ApplicationTests{ Time.setDeltaProvider(() -> 1f); logic.reset(); + //pathfinder pollutes queue with garbage, causing OOM + Reflect.get(HeadlessApplication.class, Core.app, "runnables").clear(); state.rules.sector = zone.sector; world.loadGenerator(zone.generator.map.width, zone.generator.map.height, tiles -> zone.generator.generate(tiles, new WorldParams())); zone.rules.get(state.rules);