3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-29 01:20:10 +01:00
Paper/nms-patches/ContainerLectern.patch

77 Zeilen
2.8 KiB
Diff

2019-04-23 04:00:00 +02:00
--- a/net/minecraft/server/ContainerLectern.java
+++ b/net/minecraft/server/ContainerLectern.java
@@ -1,15 +1,40 @@
2019-04-23 04:00:00 +02:00
package net.minecraft.server;
+// CraftBukkit start
+import org.bukkit.Bukkit;
2019-04-23 04:00:00 +02:00
+import org.bukkit.craftbukkit.inventory.CraftInventoryLectern;
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerTakeLecternBookEvent;
2019-04-23 04:00:00 +02:00
+// CraftBukkit end
+
public class ContainerLectern extends Container {
+ // CraftBukkit start
+ private CraftInventoryView bukkitEntity = null;
+ private Player player;
+
+ @Override
+ public CraftInventoryView getBukkitView() {
+ if (bukkitEntity != null) {
+ return bukkitEntity;
+ }
+
+ CraftInventoryLectern inventory = new CraftInventoryLectern(this.inventory);
+ bukkitEntity = new CraftInventoryView(this.player, inventory, this);
+ return bukkitEntity;
+ }
+ // CraftBukkit end
private final IInventory inventory;
private final IContainerProperties containerProperties;
- public ContainerLectern(int i) {
- this(i, new InventorySubcontainer(1), new ContainerProperties(1));
+ // CraftBukkit start - add player
+ public ContainerLectern(int i, PlayerInventory playerinventory) {
+ this(i, new InventorySubcontainer(1), new ContainerProperties(1), playerinventory);
}
- public ContainerLectern(int i, IInventory iinventory, IContainerProperties icontainerproperties) {
+ public ContainerLectern(int i, IInventory iinventory, IContainerProperties icontainerproperties, PlayerInventory playerinventory) {
+ // CraftBukkit end
super(Containers.LECTERN, i);
a(iinventory, 1);
a(icontainerproperties, 1);
@@ -23,6 +48,7 @@
2019-04-23 04:00:00 +02:00
}
});
this.a(icontainerproperties);
+ player = (Player) playerinventory.player.getBukkitEntity(); // CraftBukkit
}
@Override
@@ -48,6 +74,13 @@
2019-05-27 22:30:00 +02:00
return false;
}
2019-05-27 22:30:00 +02:00
+ // CraftBukkit start - Event for taking the book
+ PlayerTakeLecternBookEvent event = new PlayerTakeLecternBookEvent(player, ((CraftInventoryLectern) getBukkitView().getTopInventory()).getHolder());
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ return false;
+ }
+ // CraftBukkit end
ItemStack itemstack = this.inventory.splitWithoutUpdate(0);
2019-05-27 22:30:00 +02:00
this.inventory.update();
@@ -70,6 +103,7 @@
2019-04-23 04:00:00 +02:00
@Override
public boolean canUse(EntityHuman entityhuman) {
+ if (!this.checkReachable) return true; // CraftBukkit
return this.inventory.a(entityhuman);
}
}