mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-05 06:32:17 -07:00
f00727c57e
Co-authored-by: Bjarne Koll <git@lynxplay.dev> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Co-authored-by: MiniDigger | Martin <admin@minidigger.dev> Co-authored-by: Nassim Jahnke <nassim@njahnke.dev> Co-authored-by: Noah van der Aa <ndvdaa@gmail.com> Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com> Co-authored-by: Tamion <70228790+notTamion@users.noreply.github.com> Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com>
66 lines
2.2 KiB
Diff
66 lines
2.2 KiB
Diff
--- a/net/minecraft/world/CompoundContainer.java
|
|
+++ b/net/minecraft/world/CompoundContainer.java
|
|
@@ -7,6 +_,53 @@
|
|
public final Container container1;
|
|
public final Container container2;
|
|
|
|
+ // CraftBukkit start - add fields and methods
|
|
+ public java.util.List<org.bukkit.entity.HumanEntity> transaction = new java.util.ArrayList<>();
|
|
+
|
|
+ @Override
|
|
+ public java.util.List<ItemStack> getContents() {
|
|
+ java.util.List<ItemStack> result = new java.util.ArrayList<>(this.getContainerSize());
|
|
+ for (int i = 0; i < this.getContainerSize(); i++) {
|
|
+ result.add(this.getItem(i));
|
|
+ }
|
|
+ return result;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void onOpen(org.bukkit.craftbukkit.entity.CraftHumanEntity player) {
|
|
+ this.container1.onOpen(player);
|
|
+ this.container2.onOpen(player);
|
|
+ this.transaction.add(player);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void onClose(org.bukkit.craftbukkit.entity.CraftHumanEntity player) {
|
|
+ this.container1.onClose(player);
|
|
+ this.container2.onClose(player);
|
|
+ this.transaction.remove(player);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public java.util.List<org.bukkit.entity.HumanEntity> getViewers() {
|
|
+ return this.transaction;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public @javax.annotation.Nullable org.bukkit.inventory.InventoryHolder getOwner() {
|
|
+ return null; // This method won't be called since CraftInventoryDoubleChest doesn't defer to here
|
|
+ }
|
|
+
|
|
+ public void setMaxStackSize(int size) {
|
|
+ this.container1.setMaxStackSize(size);
|
|
+ this.container2.setMaxStackSize(size);
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public org.bukkit.Location getLocation() {
|
|
+ return this.container1.getLocation(); // TODO: right?
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
public CompoundContainer(Container container1, Container container2) {
|
|
this.container1 = container1;
|
|
this.container2 = container2;
|
|
@@ -58,7 +_,7 @@
|
|
|
|
@Override
|
|
public int getMaxStackSize() {
|
|
- return this.container1.getMaxStackSize();
|
|
+ return Math.min(this.container1.getMaxStackSize(), this.container2.getMaxStackSize()); // CraftBukkit - check both sides
|
|
}
|
|
|
|
@Override
|