From 00b505ee5621e2844b57242f5c111728ff0a4851 Mon Sep 17 00:00:00 2001 From: NONPLAYT Date: Thu, 26 Jan 2023 20:28:35 +0300 Subject: [PATCH] Update Upstream --- gradle.properties | 2 +- ...Converter-for-itemstack-entity-deser.patch | 32 ------------------- ...> 0025-Skip-cloning-loot-parameters.patch} | 0 3 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 patches/server/0025-PaperPR-Use-DataConverter-for-itemstack-entity-deser.patch rename patches/server/{0049-Skip-cloning-loot-parameters.patch => 0025-Skip-cloning-loot-parameters.patch} (100%) diff --git a/gradle.properties b/gradle.properties index 9fc8d9f..fb14a6f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group=gq.bxteam.divinemc version=1.19.3-R0.1-SNAPSHOT mcVersion=1.19.3 -pufferfishRef=8d7c300cf2b8a46ee6849716147401c5a1f10dbd +pufferfishRef=950abffe8e503d72803c2b7ceb7fb96d1cb07aef org.gradle.jvmargs=-Xmx2G diff --git a/patches/server/0025-PaperPR-Use-DataConverter-for-itemstack-entity-deser.patch b/patches/server/0025-PaperPR-Use-DataConverter-for-itemstack-entity-deser.patch deleted file mode 100644 index 54948f7..0000000 --- a/patches/server/0025-PaperPR-Use-DataConverter-for-itemstack-entity-deser.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic <15055071+Machine-Maker@users.noreply.github.com> -Date: Fri, 10 Dec 2021 08:15:36 -0500 -Subject: [PATCH] PaperPR Use DataConverter for itemstack/entity - deserialization - - -diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index be85f38da7e4b022455bd17697e48ed34cd30f1a..fc0d7d80de49a970ba7a0fae65e62202a41b05d5 100644 ---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -456,8 +456,8 @@ public final class CraftMagicNumbers implements UnsafeValues { - - CompoundTag compound = deserializeNbtFromBytes(data); - int dataVersion = compound.getInt("DataVersion"); -- Dynamic converted = DataFixers.getDataFixer().update(References.ITEM_STACK, new Dynamic(NbtOps.INSTANCE, compound), dataVersion, getDataVersion()); -- return CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.of((CompoundTag) converted.getValue())); -+ compound = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.ITEM_STACK, compound, dataVersion, getDataVersion()); // Paper - rewrite dataconverter -+ return CraftItemStack.asCraftMirror(net.minecraft.world.item.ItemStack.of(compound)); - } - - @Override -@@ -477,8 +477,7 @@ public final class CraftMagicNumbers implements UnsafeValues { - - CompoundTag compound = deserializeNbtFromBytes(data); - int dataVersion = compound.getInt("DataVersion"); -- Dynamic converted = DataFixers.getDataFixer().update(References.ENTITY_TREE, new Dynamic<>(NbtOps.INSTANCE, compound), dataVersion, getDataVersion()); -- compound = (CompoundTag) converted.getValue(); -+ compound = ca.spottedleaf.dataconverter.minecraft.MCDataConverter.convertTag(ca.spottedleaf.dataconverter.minecraft.datatypes.MCTypeRegistry.ENTITY, compound, dataVersion, getDataVersion()); // Paper - rewrite dataconverter - if (!preserveUUID) compound.remove("UUID"); // Generate a new UUID so we don't have to worry about deserializing the same entity twice - return net.minecraft.world.entity.EntityType.create(compound, ((org.bukkit.craftbukkit.CraftWorld) world).getHandle()) - .orElseThrow(() -> new IllegalArgumentException("An ID was not found for the data. Did you downgrade?")).getBukkitEntity(); diff --git a/patches/server/0049-Skip-cloning-loot-parameters.patch b/patches/server/0025-Skip-cloning-loot-parameters.patch similarity index 100% rename from patches/server/0049-Skip-cloning-loot-parameters.patch rename to patches/server/0025-Skip-cloning-loot-parameters.patch