Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix UUID not being updated when changing world of MapView

Browse Source
This commit is contained in:
Phoenix616 2023-04-04 19:36:37 +01:00
parent e43000601d
commit 3ae90697f3
No known key found for this signature in database
GPG Key ID: 40E2321E71738EB0
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nms-patches/net/minecraft/world/level/saveddata/maps/WorldMap.patch
View File

@ -24,7 +24,7 @@
+ // CraftBukkit start + // CraftBukkit start
+ public final CraftMapView mapView; + public final CraftMapView mapView;
+ private CraftServer server; + private CraftServer server;
+ private UUID uniqueId = null; + public UUID uniqueId = null;
+ public String id; + public String id;
+ // CraftBukkit end + // CraftBukkit end
+ +

10
src/main/java/org/bukkit/craftbukkit/map/CraftMapView.java
View File

@ -64,12 +64,20 @@ public final class CraftMapView implements MapView {
ResourceKey<net.minecraft.world.level.World> dimension = worldMap.dimension; ResourceKey<net.minecraft.world.level.World> dimension = worldMap.dimension;
WorldServer world = MinecraftServer.getServer().getLevel(dimension); WorldServer world = MinecraftServer.getServer().getLevel(dimension);
return (world == null) ? null : world.getWorld(); if (world != null) {
return world.getWorld();
}
if (worldMap.uniqueId != null) {
return Bukkit.getServer().getWorld(worldMap.uniqueId);
}
return null;
} }
@Override @Override
public void setWorld(World world) { public void setWorld(World world) {
worldMap.dimension = ((CraftWorld) world).getHandle().dimension(); worldMap.dimension = ((CraftWorld) world).getHandle().dimension();
worldMap.uniqueId = world.getUID();
} }
@Override @Override