Update to Minecraft 1.18-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-11-22 09:00:00 +11:00
parent a852b81a69
commit 43702a9e10
700 changed files with 10286 additions and 10098 deletions

View File

@@ -41,7 +41,7 @@ public class CraftMapCanvas implements MapCanvas {
return;
if (buffer[y * 128 + x] != color) {
buffer[y * 128 + x] = color;
mapView.worldMap.flagDirty(x, y);
mapView.worldMap.setColorsDirty(x, y);
}
}

View File

@@ -42,7 +42,7 @@ public class CraftMapRenderer extends MapRenderer {
}
MapIcon decoration = worldMap.decorations.get(key);
cursors.addCursor(decoration.getX(), decoration.getY(), (byte) (decoration.getRotation() & 15), decoration.getType().a(), true, CraftChatMessage.fromComponent(decoration.getName()));
cursors.addCursor(decoration.getX(), decoration.getY(), (byte) (decoration.getRot() & 15), decoration.getType().getIcon(), true, CraftChatMessage.fromComponent(decoration.getName()));
}
}

View File

@@ -62,14 +62,14 @@ public final class CraftMapView implements MapView {
@Override
public World getWorld() {
ResourceKey<net.minecraft.world.level.World> dimension = worldMap.dimension;
WorldServer world = MinecraftServer.getServer().getWorldServer(dimension);
WorldServer world = MinecraftServer.getServer().getLevel(dimension);
return (world == null) ? null : world.getWorld();
}
@Override
public void setWorld(World world) {
worldMap.dimension = ((CraftWorld) world).getHandle().getDimensionKey();
worldMap.dimension = ((CraftWorld) world).getHandle().dimension();
}
@Override