mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-27 19:37:35 +01:00
dcebe229b5
--- work/Bukkit Submodule work/Bukkit 1627782b..67e91ef7: > Fix some incorrectly handled JavaDoc > SPIGOT-4478: Update PlayerLoginEvent docs > Add API to manipulate boss bar of entities and those created by commands --- work/CraftBukkit Submodule work/CraftBukkit ca22de36..3a911828: > SPIGOT-4477: Arrows only firing direction of boat > SPIGOT-4478: NPE during PlayerLoginEvent recipe manipulation > Add API to manipulate boss bar of entities and those created by commands --- work/Spigot Submodule work/Spigot 2474d93d..947a8e7f: > Rebuild patches
47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
From 8cc37885f23c80ab3c775d97e07067eda0003804 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Mon, 5 Nov 2018 04:23:51 +0000
|
|
Subject: [PATCH] Restore custom InventoryHolder support
|
|
|
|
Upstream removed the ability to consistently use a custom InventoryHolder,
|
|
However, the implementation does not use an InventoryHolder in any form
|
|
outside of custom inventories.
|
|
|
|
We can take that knowledge and apply some expected behavior, if we're given
|
|
an inventory holder, we should use it and return a custom inventory with the
|
|
holder, otherwise, create an inventory backed by the intended inventory, as
|
|
per upstream behavior.
|
|
|
|
This provides a "best of both worlds" scenario: plugins with InventoryHolder's
|
|
will always work as intended in the past, those without will create implementation
|
|
based inventories.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
|
|
index 23389743d..d25928e09 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
|
|
@@ -31,10 +31,20 @@ public final class CraftInventoryCreator {
|
|
}
|
|
|
|
public Inventory createInventory(InventoryHolder holder, InventoryType type) {
|
|
+ // Paper start
|
|
+ if (holder != null) {
|
|
+ return DEFAULT_CONVERTER.createInventory(holder, type);
|
|
+ }
|
|
+ //noinspection ConstantConditions // Paper end
|
|
return converterMap.get(type).createInventory(holder, type);
|
|
}
|
|
|
|
public Inventory createInventory(InventoryHolder holder, InventoryType type, String title) {
|
|
+ // Paper start
|
|
+ if (holder != null) {
|
|
+ return DEFAULT_CONVERTER.createInventory(holder, type, title);
|
|
+ }
|
|
+ //noinspection ConstantConditions // Paper end
|
|
return converterMap.get(type).createInventory(holder, type, title);
|
|
}
|
|
|
|
--
|
|
2.19.1
|
|
|