mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 06:24:06 +01:00
ef0e5a642d
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 Bukkit Changes: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
27 lines
1.4 KiB
Diff
27 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: chickeneer <emcchickeneer@gmail.com>
|
|
Date: Tue, 16 Feb 2021 21:37:51 -0600
|
|
Subject: [PATCH] Prevent grindstones from overstacking items
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
|
|
index 7a0c38c743ef02f5b9c052f88c2d6429a53b8286..740b778ce14f241e509f17c3a84b9ed47cdeeebe 100644
|
|
--- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
|
|
+++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java
|
|
@@ -198,13 +198,13 @@ public class GrindstoneMenu extends AbstractContainerMenu {
|
|
i = Math.max(item.getMaxDamage() - l, 0);
|
|
itemstack2 = this.mergeEnchants(itemstack, itemstack1);
|
|
if (!itemstack2.isDamageableItem()) {
|
|
- if (!ItemStack.matches(itemstack, itemstack1)) {
|
|
+ if (!ItemStack.matches(itemstack, itemstack1) || itemstack2.getMaxStackSize() == 1) { // Paper - add max stack size check
|
|
this.resultSlots.setItem(0, ItemStack.EMPTY);
|
|
this.broadcastChanges();
|
|
return;
|
|
}
|
|
|
|
- b0 = 2;
|
|
+ b0 = 2; // Paper - the problem line for above change, causing over-stacking
|
|
}
|
|
} else {
|
|
boolean flag3 = !itemstack.isEmpty();
|