|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | +From: BillyGalbreath <blake.galbreath@gmail.com> |
| 3 | +Date: Sat, 15 Oct 2022 13:19:07 -0500 |
| 4 | +Subject: [PATCH] Allow grindstone overstacking items |
| 5 | + |
| 6 | + |
| 7 | +diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java |
| 8 | +index 43d7ca6ceb89d65149314e56a846081d6c3a048a..1344c2bc08743088c56862469949dcb148a99a8b 100644 |
| 9 | +--- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java |
| 10 | ++++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java |
| 11 | +@@ -200,7 +200,7 @@ public class GrindstoneMenu extends AbstractContainerMenu { |
| 12 | + i = Math.max(item.getMaxDamage() - l, 0); |
| 13 | + itemstack2 = this.mergeEnchants(itemstack, itemstack1); |
| 14 | + if (!itemstack2.isDamageableItem()) { |
| 15 | +- if (!ItemStack.matches(itemstack, itemstack1) || itemstack2.getMaxStackSize() == 1) { // Paper - add max stack size check |
| 16 | ++ if (!ItemStack.matches(itemstack, itemstack1) || ((org.bukkit.craftbukkit.entity.CraftPlayer)this.player).getHandle().getLevel().purpurConfig.grindstoneAllowOversizedStacking || itemstack2.getMaxStackSize() == 1) { // Paper - add max stack size check // Purpur |
| 17 | + this.resultSlots.setItem(0, ItemStack.EMPTY); |
| 18 | + this.broadcastChanges(); |
| 19 | + return; |
| 20 | +diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java |
| 21 | +index 33d7c132b19095598eb681da8487a072f1dccab6..daa437f3aaebed4d917fde65d75a8a941755a764 100644 |
| 22 | +--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java |
| 23 | ++++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java |
| 24 | +@@ -905,6 +905,11 @@ public class PurpurWorldConfig { |
| 25 | + endPortalSafeTeleporting = getBoolean("blocks.end_portal.safe-teleporting", endPortalSafeTeleporting); |
| 26 | + } |
| 27 | + |
| 28 | ++ public boolean grindstoneAllowOversizedStacking = false; |
| 29 | ++ private void grindstoneSettings() { |
| 30 | ++ grindstoneAllowOversizedStacking = getBoolean("blocks.grindstone.allow-oversized-stacking", grindstoneAllowOversizedStacking); |
| 31 | ++ } |
| 32 | ++ |
| 33 | + public boolean mobsSpawnOnPackedIce = true; |
| 34 | + public boolean mobsSpawnOnBlueIce = true; |
| 35 | + public boolean snowOnBlueIce = true; |
0 commit comments