aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0002-Remap-fixes.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2023-09-21 19:31:59 -0700
committerJake Potrebic <[email protected]>2023-09-21 20:17:35 -0700
commit78a003ee897f74c5e888d5dd152a5f85e49b8b8d (patch)
tree5c3b75104a5e031fe6a7ef0ce554346048ddc7db /patches/server/0002-Remap-fixes.patch
parent7b29d1f4c599024c3913bbb67a693e32591ca53a (diff)
downloadPaper-78a003ee897f74c5e888d5dd152a5f85e49b8b8d.tar.gz
Paper-78a003ee897f74c5e888d5dd152a5f85e49b8b8d.zip
work and compile errors
Diffstat (limited to 'patches/server/0002-Remap-fixes.patch')
-rw-r--r--patches/server/0002-Remap-fixes.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/patches/server/0002-Remap-fixes.patch b/patches/server/0002-Remap-fixes.patch
index 2e453ea204..803207ad07 100644
--- a/patches/server/0002-Remap-fixes.patch
+++ b/patches/server/0002-Remap-fixes.patch
@@ -73,6 +73,21 @@ index 7918deb55e6ed2e16eba501ab380a456270d9512..a81475d0cd3c5b75b4abe0d1a0138937
return new Object2ObjectLinkedOpenHashMap<>(); // CraftBukkit
});
ResourceLocation minecraftkey = recipeholder.id();
+diff --git a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
+index fce67663f0a954d9f184c04bf96e23e6fb2ac5eb..c21dd258d749c28e509c86a70c1f85712aeeda9e 100644
+--- a/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
++++ b/src/main/java/net/minecraft/world/level/storage/loot/LootTable.java
+@@ -250,8 +250,8 @@ public class LootTable {
+
+ public static class Builder implements FunctionUserBuilder<LootTable.Builder> {
+
+- private final Builder<LootPool> pools = ImmutableList.builder();
+- private final Builder<LootItemFunction> functions = ImmutableList.builder();
++ private final ImmutableList.Builder<LootPool> pools = ImmutableList.builder();
++ private final ImmutableList.Builder<LootItemFunction> functions = ImmutableList.builder();
+ private LootContextParamSet paramSet;
+ private Optional<ResourceLocation> randomSequence;
+
diff --git a/src/test/java/org/bukkit/DyeColorsTest.java b/src/test/java/org/bukkit/DyeColorsTest.java
index ad52c3fc6210939a39ef77a382c640a24ee44838..6b7dd01778f0a5d3a96d2d04af4b525d17efbfba 100644
--- a/src/test/java/org/bukkit/DyeColorsTest.java