mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
Updated Upstream (Paper & Pufferfish)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@443c506 Fix Nullability Annotations for PrepareItemEnchantEvent (#7681) Pufferfish Changes: pufferfish-gg/Pufferfish@1d94256 Updated Upstream (Paper)
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
group = org.purpurmc.purpur
|
||||
version = 1.18.2-R0.1-SNAPSHOT
|
||||
|
||||
paperCommit = 04c7b16bde362abe8faeb32383b346c3e4c51f76
|
||||
paperCommit = 443c5062c1b636e169707c2dcd7eb3ab5d6c7ed9
|
||||
|
||||
org.gradle.caching = true
|
||||
org.gradle.parallel = true
|
||||
|
||||
@@ -3260,6 +3260,22 @@ index 8a07d5d25086d7544757bb86181fbe2b5e743d29..9be1ce7f5b956f0c82151ea02e555e7d
|
||||
if (nbt.contains("LootTable", 8)) {
|
||||
this.lootTable = new ResourceLocation(nbt.getString("LootTable"));
|
||||
this.lootTableSeed = nbt.getLong("LootTableSeed");
|
||||
diff --git a/src/main/java/net/minecraft/world/inventory/LecternMenu.java b/src/main/java/net/minecraft/world/inventory/LecternMenu.java
|
||||
index ff79925bc6437222f9ceb133e21bbc0600cc74ed..8674b35c12c87bd169d834801e71c1c5c71dc9bc 100644
|
||||
--- a/src/main/java/net/minecraft/world/inventory/LecternMenu.java
|
||||
+++ b/src/main/java/net/minecraft/world/inventory/LecternMenu.java
|
||||
@@ -119,6 +119,11 @@ public class LecternMenu extends AbstractContainerMenu {
|
||||
}
|
||||
}
|
||||
}
|
||||
+
|
||||
+ @Override
|
||||
+ public ItemStack quickMoveStack(net.minecraft.world.entity.player.Player player, int index) {
|
||||
+ return ItemStack.EMPTY;
|
||||
+ }
|
||||
|
||||
@Override
|
||||
public void setData(int id, int value) {
|
||||
diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
|
||||
index ffe5476d8ed15ee4384b679c341688787205ce59..9051559e78851257a56a998b4b882ebbcc394639 100644
|
||||
--- a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
|
||||
|
||||
Reference in New Issue
Block a user