geforkt von Mirrors/Paper
be13705177
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 CraftBukkit Changes: 6b8cd9a7 SPIGOT-6207: forcibly drop the items of a converted zombie villager
27 Zeilen
1.4 KiB
Diff
27 Zeilen
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/ContainerGrindstone.java b/src/main/java/net/minecraft/world/inventory/ContainerGrindstone.java
|
|
index 1d5dcbbd3870eb8e1013a97f6ce882bfc096bf95..a841c47c25287080738b04352ea4e8eaa77dacdd 100644
|
|
--- a/src/main/java/net/minecraft/world/inventory/ContainerGrindstone.java
|
|
+++ b/src/main/java/net/minecraft/world/inventory/ContainerGrindstone.java
|
|
@@ -196,13 +196,13 @@ public class ContainerGrindstone extends Container {
|
|
i = Math.max(item.getMaxDurability() - l, 0);
|
|
itemstack2 = this.b(itemstack, itemstack1);
|
|
if (!itemstack2.e()) {
|
|
- if (!ItemStack.matches(itemstack, itemstack1)) {
|
|
+ if (!ItemStack.matches(itemstack, itemstack1) || itemstack2.getMaxStackSize() == 1) { // Paper - add max stack size check
|
|
this.resultInventory.setItem(0, ItemStack.b);
|
|
this.c();
|
|
return;
|
|
}
|
|
|
|
- b0 = 2;
|
|
+ b0 = 2; // Paper - the problem line for above change, causing over-stacking
|
|
}
|
|
} else {
|
|
boolean flag3 = !itemstack.isEmpty();
|