mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-25 14:13:43 +02:00
* Expose server build information * squash patches * final tweaks --------- Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: masmc05 <masmc05@gmail.com>
23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Wed, 27 Dec 2023 16:46:07 -0800
|
|
Subject: [PATCH] Add missing InventoryType
|
|
|
|
Upstream did not add a DECORATED_POT inventory type
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
|
index 3b0d3e9a067fccb10122c273aaf658ba240aa716..af1ae3dacb628da23f7d2988c6e76d3fb2d64103 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
|
@@ -541,6 +541,10 @@ public class CraftInventory implements Inventory {
|
|
return InventoryType.COMPOSTER;
|
|
} else if (this.inventory instanceof JukeboxBlockEntity) {
|
|
return InventoryType.JUKEBOX;
|
|
+ // Paper start
|
|
+ } else if (this.inventory instanceof net.minecraft.world.level.block.entity.DecoratedPotBlockEntity) {
|
|
+ return org.bukkit.event.inventory.InventoryType.DECORATED_POT;
|
|
+ // Paper end
|
|
} else {
|
|
return InventoryType.CHEST;
|
|
}
|