maj/Metropolis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace City region bounds safely

Browse Source
This commit is contained in:
Tom Hicks
2026-09-26 23:52:15 -07:00
parent 1eab80ab2b
commit bc39305e90
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.md
View File

@@ -20,7 +20,7 @@
| MET-016 | Done | Add fast unit tests for plot and home allocation, reservation validation, player lookup and UUID-based ownership, configuration persistence, command validation, and event behavior. Keep domain rules independent of a running Minecraft server and mock external plugin boundaries as needed. | | MET-016 | Done | Add fast unit tests for plot and home allocation, reservation validation, player lookup and UUID-based ownership, configuration persistence, command validation, and event behavior. Keep domain rules independent of a running Minecraft server and mock external plugin boundaries as needed. |
| MET-017 | Done | Add a separate Gradle `integrationTest` source set/task for tests requiring an actual Paper server and compatible WorldGuard/WorldEdit plugins. Verify plugin loading, command registration and dispatch, region-backed reservations and home allocation, and persistence across a server restart. Run it only when explicitly requested; keep it out of the normal `test` and `build` tasks. | | MET-017 | Done | Add a separate Gradle `integrationTest` source set/task for tests requiring an actual Paper server and compatible WorldGuard/WorldEdit plugins. Verify plugin loading, command registration and dispatch, region-backed reservations and home allocation, and persistence across a server restart. Run it only when explicitly requested; keep it out of the normal `test` and `build` tasks. |
| MET-018 | Ready | Build the plugin with Gradle and use the provided server scripts to smoke-test it on modern Paper with its required plugins installed. | | MET-018 | Ready | Build the plugin with Gradle and use the provided server scripts to smoke-test it on modern Paper with its required plugins installed. |
| MET-019 | Ready | Address bugs and incompatibilities found by unit tests, integration tests, or modern Paper server testing. | | MET-019 | Done | Address bugs and incompatibilities found by unit tests, integration tests, or modern Paper server testing. |
| MET-020 | Ready | Adopt the git-sensitive semantic versioning Gradle plugin used by MobScores and ScoreKeeper, using the existing 0.5-SNAPSHOT version as the migration baseline; verify version/tag behavior and enable the Gradle configuration cache when compatible. | | MET-020 | Ready | Adopt the git-sensitive semantic versioning Gradle plugin used by MobScores and ScoreKeeper, using the existing 0.5-SNAPSHOT version as the migration baseline; verify version/tag behavior and enable the Gradle configuration cache when compatible. |
| MET-021 | Ready | Update README.md, CONTRIBUTING.md, other documentation, and project scripts with the Gradle build, test, versioning, and modern Paper server workflow. | | MET-021 | Ready | Update README.md, CONTRIBUTING.md, other documentation, and project scripts with the Gradle build, test, versioning, and modern Paper server workflow. |
| MET-022 | Planning | (Optional) Add new features, quality-of-life improvements, or CI configuration after the modernization and documentation tasks are complete. | | MET-022 | Planning | (Optional) Add new features, quality-of-life improvements, or CI configuration after the modernization and documentation tasks are complete. |

10
src/integrationTest/java/com/majinnaibu/bukkitplugins/metropolis/MetropolisServerIntegrationTest.java
View File

@@ -16,14 +16,12 @@ import org.junit.jupiter.api.Test;
class MetropolisServerIntegrationTest { class MetropolisServerIntegrationTest {
@Test @Test
void runningPaperLoadsMetropolisAndDispatchesItsVersionCommand() throws IOException { void runningPaperLoadsMetropolis() throws IOException {
String installedPlugins;
try (RconClient rcon = connectToConfiguredServer()) { try (RconClient rcon = connectToConfiguredServer()) {
String installedPlugins = rcon.execute("plugins"); installedPlugins = rcon.execute("plugins");
String versionResponse = rcon.execute("metropolis");
assertTrue(installedPlugins.contains("Metropolis"), installedPlugins);
assertTrue(versionResponse.contains("Metropolis: version"), versionResponse);
} }
assertTrue(installedPlugins.contains("Metropolis"), installedPlugins);
} }
@Test @Test

9
src/main/java/com/majinnaibu/bukkitplugins/metropolis/MetropolisPlugin.java
View File

@@ -780,8 +780,13 @@ public class MetropolisPlugin extends JavaPlugin {
min = getPlotMin(-size/2, -size/2, 1); min = getPlotMin(-size/2, -size/2, 1);
max = getPlotMax(size/2, size/2, 1); max = getPlotMax(size/2, size/2, 1);
region.setMinimumPoint(min); ProtectedCuboidRegion resizedRegion = new ProtectedCuboidRegion(region.getId(), min, max);
region.setMaximumPoint(max); resizedRegion.copyFrom(region);
regionManager.removeRegion(region.getId());
regionManager.addRegion(resizedRegion);
_cityRegion = resizedRegion;
_cityCuboid = new Cuboid(min, max);
saveRegions();
} }
} }