diff options
| author | TomTom <[email protected]> | 2023-11-03 15:05:57 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-11-03 14:05:57 +0000 |
| commit | 487109fddc74813b81bf17dfe8ec7be443963d9d (patch) | |
| tree | 8fbfe1ec07553dc9149882389257d948b0486e02 /patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch | |
| parent | 8493340be4fa69fa9369719272e5dff1b7a2f455 (diff) | |
| download | Paper-487109fddc74813b81bf17dfe8ec7be443963d9d.tar.gz Paper-487109fddc74813b81bf17dfe8ec7be443963d9d.zip | |
Readd 0414 use distance map to optimise entity tracker (#9868)
Diffstat (limited to 'patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch')
| -rw-r--r-- | patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch new file mode 100644 index 0000000000..5f8b5b11ed --- /dev/null +++ b/patches/server/0640-Fix-incosistency-issue-with-empty-map-items-in-CB.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Shane Freeder <[email protected]> +Date: Sun, 1 Aug 2021 09:49:06 +0100 +Subject: [PATCH] Fix incosistency issue with empty map items in CB + + +diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java +index 53515854d05a0c27a65f71193424236a21b11f5f..c368b437597edf7e165326727ae778a69c3fcc83 100644 +--- a/src/main/java/net/minecraft/world/item/MapItem.java ++++ b/src/main/java/net/minecraft/world/item/MapItem.java +@@ -73,7 +73,7 @@ public class MapItem extends ComplexItem { + public static Integer getMapId(ItemStack stack) { + CompoundTag nbttagcompound = stack.getTag(); + +- return nbttagcompound != null && nbttagcompound.contains("map", 99) ? nbttagcompound.getInt("map") : -1; // CraftBukkit - make new maps for no tag ++ return nbttagcompound != null && nbttagcompound.contains("map", 99) ? nbttagcompound.getInt("map") : null; // CraftBukkit - make new maps for no tag // Paper - don't return invalid ID + } + + public static int createNewSavedData(Level world, int x, int z, int scale, boolean showIcons, boolean unlimitedTracking, ResourceKey<Level> dimension) { +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java +index 70b365afc40f11d4da3aea2b5d6b2467f517deac..a74ea06e3a190916527ab2c85d13f1e34c08d50a 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaMap.java +@@ -133,6 +133,7 @@ class CraftMetaMap extends CraftMetaItem implements MapMeta { + + @Override + public int getMapId() { ++ Preconditions.checkState(this.hasMapView(), "Item does not have map associated - check hasMapView() first!"); // Paper - more friendly message + return this.mapId; + } + |