mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 07:20:24 +01:00
Add Inventory#close (#5610)
This commit is contained in:
parent
29bf6cd416
commit
239935d183
2 changed files with 51 additions and 0 deletions
26
Spigot-API-Patches/0298-Inventory-close.patch
Normal file
26
Spigot-API-Patches/0298-Inventory-close.patch
Normal file
|
@ -0,0 +1,26 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||
Date: Tue, 11 May 2021 14:54:20 -0700
|
||||
Subject: [PATCH] Inventory#close
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java
|
||||
index 7956aebcb390379677dccf7c9561866cf94c024c..8f00cb2e3bc9963e9657c1b2493e8b015a6664d0 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/Inventory.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/Inventory.java
|
||||
@@ -353,6 +353,15 @@ public interface Inventory extends Iterable<ItemStack> {
|
||||
*/
|
||||
public void clear();
|
||||
|
||||
+ // Paper start
|
||||
+ /**
|
||||
+ * Closes the inventory for all viewers.
|
||||
+ *
|
||||
+ * @return the number if viewers the inventory was closed for
|
||||
+ */
|
||||
+ public int close();
|
||||
+ // Paper end
|
||||
+
|
||||
/**
|
||||
* Gets a list of players viewing the inventory. Note that a player is
|
||||
* considered to be viewing their own inventory and internal crafting
|
25
Spigot-Server-Patches/0727-Inventory-close.patch
Normal file
25
Spigot-Server-Patches/0727-Inventory-close.patch
Normal file
|
@ -0,0 +1,25 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||
Date: Tue, 11 May 2021 14:54:56 -0700
|
||||
Subject: [PATCH] Inventory#close
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||||
index c3fa97ac34e1fc61ae02f224f8afe5a0b486fb4d..f6001047ada8308cfa1d9b26677a7a5d7774de51 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
|
||||
@@ -449,6 +449,14 @@ public class CraftInventory implements Inventory {
|
||||
clear(i);
|
||||
}
|
||||
}
|
||||
+ // Paper start
|
||||
+ @Override
|
||||
+ public int close() {
|
||||
+ int count = this.inventory.getViewers().size();
|
||||
+ com.google.common.collect.Lists.newArrayList(this.inventory.getViewers()).forEach(HumanEntity::closeInventory);
|
||||
+ return count;
|
||||
+ }
|
||||
+ // Paper end
|
||||
|
||||
@Override
|
||||
public ListIterator<ItemStack> iterator() {
|
Loading…
Reference in a new issue