diff options
| author | Spottedleaf <[email protected]> | 2024-11-28 17:39:40 -0800 |
|---|---|---|
| committer | Spottedleaf <[email protected]> | 2024-11-28 18:27:59 -0800 |
| commit | da9d110d5bf8ffb090d63cd6a443b22ef1ab9d64 (patch) | |
| tree | 9dbb88d122e6c21827c230041f0b7c93d5a03bf0 /patches/server/0968-Properly-remove-the-experimental-smithing-inventory-.patch | |
| parent | 0cc7bd485760dd0abd387f64d193ffef7aa019ee (diff) | |
| download | Paper-da9d110d5bf8ffb090d63cd6a443b22ef1ab9d64.tar.gz Paper-da9d110d5bf8ffb090d63cd6a443b22ef1ab9d64.zip | |
Remove chunk save reattempt patch
This patch does not appear to be doing anything useful, and may
hide errors.
Currently, the save logic does not run through this path either
so it did not do anything.
Additionally, properly implement support for handling
RegionFileSizeException in Moonrise.
Diffstat (limited to 'patches/server/0968-Properly-remove-the-experimental-smithing-inventory-.patch')
| -rw-r--r-- | patches/server/0968-Properly-remove-the-experimental-smithing-inventory-.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/patches/server/0968-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0968-Properly-remove-the-experimental-smithing-inventory-.patch new file mode 100644 index 0000000000..9ede88caa7 --- /dev/null +++ b/patches/server/0968-Properly-remove-the-experimental-smithing-inventory-.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +Date: Thu, 8 Jun 2023 14:45:18 -0700 +Subject: [PATCH] Properly remove the experimental smithing inventory type + + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftAbstractInventoryView.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftAbstractInventoryView.java +index 149825642976124e852be9aef54a3cb4a8ac193d..71d3a5e5dc5630007cf46f4be3d39da4145dd431 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftAbstractInventoryView.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftAbstractInventoryView.java +@@ -160,7 +160,6 @@ public abstract class CraftAbstractInventoryView implements InventoryView { + type = InventoryType.SlotType.CRAFTING; + break; + case ANVIL: +- case SMITHING: + case CARTOGRAPHY: + case GRINDSTONE: + case MERCHANT: +@@ -178,6 +177,7 @@ public abstract class CraftAbstractInventoryView implements InventoryView { + } + break; + case LOOM: ++ case SMITHING: // Paper - properly remove experimental smithing inventory + case SMITHING_NEW: + if (slot == 3) { + type = InventoryType.SlotType.RESULT; |