mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-04 15:41:40 +00:00
f5b95a6716
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b0da38c2 Repository details in RuntimeException for MavenLibraryResolver#addRepository (#12939) PaperMC/Paper@1922be90 Update custom tags (#12183) PaperMC/Paper@79cf1353 Ignore HopperInventorySearchEvent when it has no listeners (#13009) PaperMC/Paper@ea014f7a feat: add stuckEntityPoiRetryDelay config (#12949) PaperMC/Paper@a9e76749 Support for showNotification in PlayerRecipeDiscoverEvent (#12992) PaperMC/Paper@5622c9dd Expose attribute sentiment (#12974) PaperMC/Paper@42b653b1 Expose more argument types (#12665) PaperMC/Paper@52d9a221 [ci/skip] Fix typo in Display javadoc (#13010) PaperMC/Paper@614e9acf Improve APIs around riptide tridents (#12996) PaperMC/Paper@51706e5a Fixed DyeItem sheep dye hunk
63 lines
3.1 KiB
Diff
63 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: HaHaWTH <fsjk947@gmail.com>
|
|
Date: Wed, 13 Mar 2024 03:33:08 +0800
|
|
Subject: [PATCH] Fix MC-65198
|
|
|
|
Mojang issues: https://bugs.mojang.com/browse/MC/issues/MC-65198
|
|
|
|
diff --git a/net/minecraft/world/inventory/ItemCombinerMenu.java b/net/minecraft/world/inventory/ItemCombinerMenu.java
|
|
index c605bd700fd9f5a6596a2bf9648492786306b025..77c0b0b6c63d0a2955fcf3a479581f09067f3e62 100644
|
|
--- a/net/minecraft/world/inventory/ItemCombinerMenu.java
|
|
+++ b/net/minecraft/world/inventory/ItemCombinerMenu.java
|
|
@@ -120,6 +120,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
|
|
if (slot != null && slot.hasItem()) {
|
|
ItemStack item = slot.getItem();
|
|
itemStack = item.copy();
|
|
+ ItemStack itemStack2 = itemStack.copy(); // Leaf - Fix MC-65198
|
|
int inventorySlotStart = this.getInventorySlotStart();
|
|
int useRowEnd = this.getUseRowEnd();
|
|
if (index == this.getResultSlot()) {
|
|
@@ -157,7 +158,7 @@ public abstract class ItemCombinerMenu extends AbstractContainerMenu {
|
|
}
|
|
|
|
this.activeQuickItem = itemStack; // Purpur - Anvil API
|
|
- slot.onTake(player, item);
|
|
+ slot.onTake(player, itemStack2); // Leaf - Fix MC-65198
|
|
this.activeQuickItem = null; // Purpur - Anvil API
|
|
}
|
|
|
|
diff --git a/net/minecraft/world/inventory/ResultSlot.java b/net/minecraft/world/inventory/ResultSlot.java
|
|
index e4cba45c327d96550a92cd5f9a30b1e5bd212747..ba237017e21d66b4eb3b47b4c7160015993da348 100644
|
|
--- a/net/minecraft/world/inventory/ResultSlot.java
|
|
+++ b/net/minecraft/world/inventory/ResultSlot.java
|
|
@@ -49,7 +49,7 @@ public class ResultSlot extends Slot {
|
|
@Override
|
|
protected void checkTakeAchievements(ItemStack stack) {
|
|
if (this.removeCount > 0) {
|
|
- stack.onCraftedBy(this.player, this.removeCount);
|
|
+ stack.onCraftedBy(this.player, stack.getCount()); // Leaf - Fix MC-65198
|
|
}
|
|
|
|
if (this.container instanceof RecipeCraftingHolder recipeCraftingHolder) {
|
|
diff --git a/net/minecraft/world/inventory/StonecutterMenu.java b/net/minecraft/world/inventory/StonecutterMenu.java
|
|
index 9b0b213d7550f02ddba2f9f19fa7b0a45437e968..516acc81b12c003df7744cd66f5dd9b95c0485a4 100644
|
|
--- a/net/minecraft/world/inventory/StonecutterMenu.java
|
|
+++ b/net/minecraft/world/inventory/StonecutterMenu.java
|
|
@@ -238,6 +238,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
|
|
ItemStack item = slot.getItem();
|
|
Item item1 = item.getItem();
|
|
itemStack = item.copy();
|
|
+ ItemStack itemStack2 = itemStack.copy(); // Leaf - Fix MC-65198
|
|
if (index == 1) {
|
|
item1.onCraftedBy(item, player);
|
|
if (!this.moveItemStackTo(item, 2, 38, true)) {
|
|
@@ -270,7 +271,7 @@ public class StonecutterMenu extends AbstractContainerMenu {
|
|
return ItemStack.EMPTY;
|
|
}
|
|
|
|
- slot.onTake(player, item);
|
|
+ slot.onTake(player, itemStack2); // Leaf - Fix MC-65198
|
|
if (index == 1) {
|
|
player.drop(item, false);
|
|
}
|