mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-21 00:17:56 +01:00
e1c0033552
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: 2b4b6d14 PR-1023: Convert InventoryView to interface CraftBukkit Changes: 68603b1c1 Use expanded interaction ranges for traced interact events eae9f760c PR-1414: Convert InventoryView to interface ee9eafe67 Fix Implementation for DamageSource#isIndirect for internal custom causing entity
27 lines
1.4 KiB
Diff
27 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
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;
|