aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch')
-rw-r--r--patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/server/0597-Fix-incosistency-issue-with-empty-map-items-in-CB.patch
new file mode 100644
index 0000000000..926fba2c7f
--- /dev/null
+++ b/patches/server/0597-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 f643d3c06bd8fc37f6c571a19d5691694b0ce8d3..d8dd99ec8bf7444c5a3c426db3a9c13e334dc0ff 100644
+--- a/src/main/java/net/minecraft/world/item/MapItem.java
++++ b/src/main/java/net/minecraft/world/item/MapItem.java
+@@ -69,7 +69,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 0c7280621cce9855dcc9569e0aefba77bfd555cb..0c7c67e1eea44487c52ebf650d35b3b43cd00c3a 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;
+ }
+