testserver/patches/unapplied/server/0555-Fix-Not-a-string-Map-C...

55 lines
2.7 KiB
Diff
Raw Normal View History

2021-06-11 12:02:28 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 8 Oct 2020 00:00:25 -0400
Subject: [PATCH] Fix "Not a string" Map Conversion spam
2021-06-11 12:02:28 +00:00
The maps did convert successfully, but had noisy logs due to Spigot
implementing this logic incorrectly.
This stops the spam by converting the old format to new before
requesting the world.
Track spigot issue to see when fixed: https://hub.spigotmc.org/jira/browse/SPIGOT-6181
2021-06-11 12:02:28 +00:00
diff --git a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
2022-03-01 05:43:03 +00:00
index 913fabc7f42c05ccec6501247a5e8d1d481756ee..4acbcafc158cf11af51d9518ba5b83aaa75f52a1 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
+++ b/src/main/java/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
2022-03-01 05:43:03 +00:00
@@ -15,6 +15,8 @@ import net.minecraft.core.BlockPos;
2021-06-11 12:02:28 +00:00
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.NumericTag;
+import net.minecraft.nbt.StringTag;
import net.minecraft.nbt.Tag;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.Packet;
2021-11-24 17:37:07 +00:00
@@ -103,7 +105,26 @@ public class MapItemSavedData extends SavedData {
}
2021-06-11 12:02:28 +00:00
public static MapItemSavedData load(CompoundTag nbt) {
2022-03-01 05:43:03 +00:00
- DataResult<ResourceKey<Level>> dataresult = DimensionType.parseLegacy(new Dynamic(NbtOps.INSTANCE, nbt.get("dimension"))); // CraftBukkit - decompile error
2021-06-11 12:02:28 +00:00
+ // Paper start - fix "Not a string" spam
+ Tag dimension = nbt.get("dimension");
2021-06-11 12:02:28 +00:00
+ if (dimension instanceof NumericTag && ((NumericTag) dimension).getAsInt() >= CraftWorld.CUSTOM_DIMENSION_OFFSET) {
+ long least = nbt.getLong("UUIDLeast");
+ long most = nbt.getLong("UUIDMost");
2021-06-11 12:02:28 +00:00
+
+ if (least != 0L && most != 0L) {
+ UUID uuid = new UUID(most, least);
+ CraftWorld world = (CraftWorld) Bukkit.getWorld(uuid);
2021-06-11 12:02:28 +00:00
+ if (world != null) {
2021-06-16 17:48:25 +00:00
+ dimension = StringTag.valueOf("minecraft:" + world.getName().toLowerCase(java.util.Locale.ENGLISH));
2021-06-11 12:02:28 +00:00
+ } else {
2021-06-16 17:48:25 +00:00
+ dimension = StringTag.valueOf("bukkit:_invalidworld_");
2021-06-11 12:02:28 +00:00
+ }
+ } else {
2021-06-16 17:48:25 +00:00
+ dimension = StringTag.valueOf("bukkit:_invalidworld_");
2021-06-11 12:02:28 +00:00
+ }
+ }
+ DataResult<ResourceKey<Level>> dataresult = DimensionType.parseLegacy(new Dynamic(NbtOps.INSTANCE, dimension)); // CraftBukkit - decompile error
+ // Paper end - fix "Not a string" spam
Logger logger = MapItemSavedData.LOGGER;
Objects.requireNonNull(logger);