aboutsummaryrefslogtreecommitdiffhomepage
path: root/removed-patches-1-20-5
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2024-04-25 23:29:16 -0700
committerJake Potrebic <[email protected]>2024-04-25 23:29:16 -0700
commit7e9da43b33aab434a49743e7bc5e969a7bf3e7d2 (patch)
treeec31eb15303ab9d9b21c73b79895947460859356 /removed-patches-1-20-5
parent2997fd6459c4518e3d0006ea7fc2b6a93e1cfea7 (diff)
downloadPaper-7e9da43b33aab434a49743e7bc5e969a7bf3e7d2.tar.gz
Paper-7e9da43b33aab434a49743e7bc5e969a7bf3e7d2.zip
support patch versions in api-version
Diffstat (limited to 'removed-patches-1-20-5')
-rw-r--r--removed-patches-1-20-5/0042-fix-ItemMeta-removing-CustomModelData.patch19
-rw-r--r--removed-patches-1-20-5/0486-Cache-burn-durations.patch36
2 files changed, 0 insertions, 55 deletions
diff --git a/removed-patches-1-20-5/0042-fix-ItemMeta-removing-CustomModelData.patch b/removed-patches-1-20-5/0042-fix-ItemMeta-removing-CustomModelData.patch
deleted file mode 100644
index e42dfffc09..0000000000
--- a/removed-patches-1-20-5/0042-fix-ItemMeta-removing-CustomModelData.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Tue, 2 Jan 2024 10:35:46 -0800
-Subject: [PATCH] fix ItemMeta removing CustomModelData
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 2157034e735c3921d4ef128688c30917aaad7161..ffdea312f93d00289364ef4d41a820cd1338f3bd 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -353,7 +353,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
- }
- }
-
-- if (tag.contains(CraftMetaItem.CUSTOM_MODEL_DATA.NBT, CraftMagicNumbers.NBT.TAG_INT)) {
-+ if (tag.contains(CraftMetaItem.CUSTOM_MODEL_DATA.NBT, CraftMagicNumbers.NBT.TAG_ANY_NUMBER)) { // Paper - correctly allow any number type
- this.customModelData = tag.getInt(CraftMetaItem.CUSTOM_MODEL_DATA.NBT);
- }
- if (tag.contains(CraftMetaItem.BLOCK_DATA.NBT, CraftMagicNumbers.NBT.TAG_COMPOUND)) {
diff --git a/removed-patches-1-20-5/0486-Cache-burn-durations.patch b/removed-patches-1-20-5/0486-Cache-burn-durations.patch
deleted file mode 100644
index 32d702d124..0000000000
--- a/removed-patches-1-20-5/0486-Cache-burn-durations.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: lukas <[email protected]>
-Date: Sun, 27 Dec 2020 16:47:00 +0100
-Subject: [PATCH] Cache burn durations
-
-
-diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 9801b777bc6ab7de91d82b29a142459292ee8605..8f7029e602300f68b3c8411caa2d9e0b1e8be62e 100644
---- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-@@ -134,7 +134,13 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
- this.recipeType = recipeType; // Paper - cook speed multiplier API
- }
-
-+ private static Map<Item, Integer> cachedBurnDurations = null; // Paper - cache burn durations
- public static Map<Item, Integer> getFuel() {
-+ // Paper start - cache burn durations
-+ if(cachedBurnDurations != null) {
-+ return cachedBurnDurations;
-+ }
-+ // Paper end - cache burn durations
- Map<Item, Integer> map = Maps.newLinkedHashMap();
-
- AbstractFurnaceBlockEntity.add(map, (ItemLike) Items.LAVA_BUCKET, 20000);
-@@ -196,7 +202,10 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
- AbstractFurnaceBlockEntity.add(map, (ItemLike) Blocks.AZALEA, 100);
- AbstractFurnaceBlockEntity.add(map, (ItemLike) Blocks.FLOWERING_AZALEA, 100);
- AbstractFurnaceBlockEntity.add(map, (ItemLike) Blocks.MANGROVE_ROOTS, 300);
-- return map;
-+ // Paper start - cache burn durations
-+ cachedBurnDurations = com.google.common.collect.ImmutableMap.copyOf(map);
-+ return cachedBurnDurations;
-+ // Paper end - cache burn durations
- }
-
- // CraftBukkit start - add fields and methods