Update to Minecraft 1.20.2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2023-09-22 02:40:00 +10:00
parent 193398c0ff
commit 8a3c8cfcd4
238 changed files with 2448 additions and 2344 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/saveddata/maps/WorldMap.java
+++ b/net/minecraft/world/level/saveddata/maps/WorldMap.java
@@ -31,6 +31,16 @@
@@ -32,6 +32,16 @@
import net.minecraft.world.level.saveddata.PersistentBase;
import org.slf4j.Logger;
@@ -17,7 +17,7 @@
public class WorldMap extends PersistentBase {
private static final Logger LOGGER = LogUtils.getLogger();
@@ -53,6 +63,13 @@
@@ -54,6 +64,13 @@
private final Map<String, WorldMapFrame> frameMarkers = Maps.newHashMap();
private int trackedDecorationCount;
@@ -28,10 +28,10 @@
+ public String id;
+ // CraftBukkit end
+
private WorldMap(int i, int j, byte b0, boolean flag, boolean flag1, boolean flag2, ResourceKey<World> resourcekey) {
this.scale = b0;
this.centerX = i;
@@ -62,6 +79,10 @@
public static PersistentBase.a<WorldMap> factory() {
return new PersistentBase.a<>(() -> {
throw new IllegalStateException("Should never create an empty map saved data");
@@ -69,6 +86,10 @@
this.unlimitedTracking = flag1;
this.locked = flag2;
this.setDirty();
@@ -42,7 +42,7 @@
}
public static WorldMap createFresh(double d0, double d1, byte b0, boolean flag, boolean flag1, ResourceKey<World> resourcekey) {
@@ -79,12 +100,30 @@
@@ -86,12 +107,30 @@
}
public static WorldMap load(NBTTagCompound nbttagcompound) {
@@ -76,7 +76,7 @@
});
int i = nbttagcompound.getInt("xCenter");
int j = nbttagcompound.getInt("zCenter");
@@ -122,13 +161,32 @@
@@ -129,13 +168,32 @@
@Override
public NBTTagCompound save(NBTTagCompound nbttagcompound) {
@@ -110,7 +110,7 @@
nbttagcompound.putInt("xCenter", this.centerX);
nbttagcompound.putInt("zCenter", this.centerZ);
nbttagcompound.putByte("scale", this.scale);
@@ -503,7 +561,7 @@
@@ -510,7 +568,7 @@
this.player = entityhuman;
}
@@ -119,7 +119,7 @@
int i = this.minDirtyX;
int j = this.minDirtyY;
int k = this.maxDirtyX + 1 - this.minDirtyX;
@@ -512,7 +570,7 @@
@@ -519,7 +577,7 @@
for (int i1 = 0; i1 < k; ++i1) {
for (int j1 = 0; j1 < l; ++j1) {
@@ -128,7 +128,7 @@
}
}
@@ -522,19 +580,29 @@
@@ -529,19 +587,29 @@
@Nullable
Packet<?> nextUpdatePacket(int i) {
WorldMap.b worldmap_b;