Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-09-27 14:52:57 +02:00
Code Issues Projects Releases Wiki Activity

Use sponge world UUIDs instead of the formatted resource-key to ensure uniqueness

Browse Source
This commit is contained in:
Lukas Rieger (Blue) 2022-08-03 17:51:29 +02:00
parent c289fd8c13
commit 35cbdf67d6
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java
View File

@ -234,7 +234,8 @@ public Optional<ServerWorld> getWorld(Object world) {
if (world instanceof String) { if (world instanceof String) {
ResourceKey resourceKey = ResourceKey.resolve((String) world); ResourceKey resourceKey = ResourceKey.resolve((String) world);
if (resourceKey != null) world = resourceKey; var serverWorld = Sponge.server().worldManager().world(resourceKey).orElse(null);
if (serverWorld != null) world = serverWorld;
} }
if (world instanceof ResourceKey) { if (world instanceof ResourceKey) {

2
implementations/sponge-8.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongeWorld.java
View File

@ -63,7 +63,7 @@ public Dimension getDimension() {
public Optional<String> getId() { public Optional<String> getId() {
var world = delegate.get(); var world = delegate.get();
if (world != null) { if (world != null) {
return Optional.of(world.key().formatted()); return Optional.of(world.uniqueId().toString());
} }
return Optional.empty(); return Optional.empty();
} }

3
implementations/sponge-9.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java
View File

@ -234,7 +234,8 @@ public Optional<ServerWorld> getWorld(Object world) {
if (world instanceof String) { if (world instanceof String) {
ResourceKey resourceKey = ResourceKey.resolve((String) world); ResourceKey resourceKey = ResourceKey.resolve((String) world);
if (resourceKey != null) world = resourceKey; var serverWorld = Sponge.server().worldManager().world(resourceKey).orElse(null);
if (serverWorld != null) world = serverWorld;
} }
if (world instanceof ResourceKey) { if (world instanceof ResourceKey) {

2
implementations/sponge-9.0.0/src/main/java/de/bluecolored/bluemap/sponge/SpongeWorld.java
View File

@ -63,7 +63,7 @@ public Dimension getDimension() {
public Optional<String> getId() { public Optional<String> getId() {
var world = delegate.get(); var world = delegate.get();
if (world != null) { if (world != null) {
return Optional.of(world.key().formatted()); return Optional.of(world.uniqueId().toString());
} }
return Optional.empty(); return Optional.empty();
} }