diff options
| author | Nassim Jahnke <[email protected]> | 2022-04-07 10:51:32 +0200 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2022-04-07 10:56:36 +0200 |
| commit | 2f16393ad93a2e4d0e9eead329053de003802889 (patch) | |
| tree | 950ee3dd350c9eaadc6650db7926119f9f207f8b | |
| parent | 11e0dcdf864efd8516f5146dbf2d5602daff86d8 (diff) | |
| download | Paper-2f16393ad93a2e4d0e9eead329053de003802889.tar.gz Paper-2f16393ad93a2e4d0e9eead329053de003802889.zip | |
Updated Upstream (CraftBukkit)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
2542945e Remove broken quickMoveStack implementation
5631e8bf SPIGOT-6973: Setting biome calls String#intern for every biome placed
| -rw-r--r-- | patches/server/0888-Fix-lectern-quick-move.patch | 24 | ||||
| -rw-r--r-- | patches/server/0888-cache-resource-keys.patch (renamed from patches/server/0889-cache-resource-keys.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0889-Allow-to-change-the-podium-for-the-EnderDragon.patch (renamed from patches/server/0890-Allow-to-change-the-podium-for-the-EnderDragon.patch) | 0 | ||||
| -rw-r--r-- | patches/server/0890-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch (renamed from patches/server/0891-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch) | 0 | ||||
| m--------- | work/CraftBukkit | 0 |
5 files changed, 0 insertions, 24 deletions
diff --git a/patches/server/0888-Fix-lectern-quick-move.patch b/patches/server/0888-Fix-lectern-quick-move.patch deleted file mode 100644 index ef55c38454..0000000000 --- a/patches/server/0888-Fix-lectern-quick-move.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Kevin Raneri <[email protected]> -Date: Sat, 2 Apr 2022 02:12:13 -0400 -Subject: [PATCH] Fix lectern quick move - - -diff --git a/src/main/java/net/minecraft/world/inventory/LecternMenu.java b/src/main/java/net/minecraft/world/inventory/LecternMenu.java -index ff79925bc6437222f9ceb133e21bbc0600cc74ed..e5498a5703f282160b8171a0b81711cfc24d323a 100644 ---- a/src/main/java/net/minecraft/world/inventory/LecternMenu.java -+++ b/src/main/java/net/minecraft/world/inventory/LecternMenu.java -@@ -120,6 +120,13 @@ public class LecternMenu extends AbstractContainerMenu { - } - } - -+ // Paper start -+ @Override -+ public ItemStack quickMoveStack(net.minecraft.world.entity.player.Player player, int index) { -+ return ItemStack.EMPTY; -+ } -+ // Paper end -+ - @Override - public void setData(int id, int value) { - super.setData(id, value); diff --git a/patches/server/0889-cache-resource-keys.patch b/patches/server/0888-cache-resource-keys.patch index 7139beb014..7139beb014 100644 --- a/patches/server/0889-cache-resource-keys.patch +++ b/patches/server/0888-cache-resource-keys.patch diff --git a/patches/server/0890-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/server/0889-Allow-to-change-the-podium-for-the-EnderDragon.patch index b1db71e97b..b1db71e97b 100644 --- a/patches/server/0890-Allow-to-change-the-podium-for-the-EnderDragon.patch +++ b/patches/server/0889-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0891-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0890-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch index c76221ca5a..c76221ca5a 100644 --- a/patches/server/0891-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch +++ b/patches/server/0890-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/work/CraftBukkit b/work/CraftBukkit -Subproject 10922194f43009dea660c8b5c9fe27f136e940a +Subproject 2542945ef49093f6e1041dd817d6f640b7fc25b |