mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
e7b1eb157b
Upstream has released updates that appears to apply and compile correctly Paper Changes: cc477e6a Force Plugins that use delayed tasks for init back in their place 597263fd Don't skip full player connection tick when dead e2c23475 Revert loaded entity list (#3304) fa87db6b Move another NetworkManager util into the inner class (#3303) 841c7d18 Make loaded entity list logic more consistent (#3301) 36f34f01 Updated Upstream (Bukkit/CraftBukkit) 5ca5f131 Rebuild all patches using the new rebuild pattern 1ccff6fa Add villager reputation API 5c0bfffa Speed up rebuilding patches and reduce diff f37381ea Optimize Network Manager to not need synchronization 8f9df2ed Anti Xray cleanup 878c66f1 No-Tick view distance implementation - Closes #3196 b87743c1 Stop copy-on-write operations for updating light data 97a9c972 Optimize isOutsideRange to use distance maps b4e629a2 Use distance map to optimise entity tracker / Misc Utils d80d1517 Optimize Entity Ticking to Loaded Chunks only 31d7686d Add item slot helper methods for various inventories (#3221) 75e1e3b3 Mob Goal API c7bc393a Revert "Don't flush packet queue off main thread" 1abd2bd2 Don't flush packet queue off main thread a4ed58a9 Clean up Direct Memory Region Files Fix for different Java versions 55e35019 Set cap on JDK per-thread native byte buffer cache b5101f4f Cleanup Region Files Direct Memory on close 81e655d7 Optimize Voxel Shape Merging ed9fc11f Sync position on teleportation 9c326fce Nanothing to see here 3e9fc24b Attempt to fix FastLogin maybe
135 lines
4.1 KiB
Diff
135 lines
4.1 KiB
Diff
From 1f9945fb4f4524e6faf06b2b374a3c4a66aaf80b Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sun, 19 Apr 2020 00:25:09 -0500
|
|
Subject: [PATCH] More anvil controls
|
|
|
|
---
|
|
.../event/inventory/AnvilTakeResultEvent.java | 52 +++++++++++++++++++
|
|
.../inventory/AnvilUpdateResultEvent.java | 35 +++++++++++++
|
|
.../org/bukkit/inventory/AnvilInventory.java | 10 ++++
|
|
3 files changed, 97 insertions(+)
|
|
create mode 100644 src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
|
|
create mode 100644 src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
|
|
|
|
diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
|
|
new file mode 100644
|
|
index 00000000..85663c0a
|
|
--- /dev/null
|
|
+++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilTakeResultEvent.java
|
|
@@ -0,0 +1,52 @@
|
|
+package net.pl3x.purpur.event.inventory;
|
|
+
|
|
+import org.bukkit.entity.HumanEntity;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.inventory.InventoryEvent;
|
|
+import org.bukkit.inventory.AnvilInventory;
|
|
+import org.bukkit.inventory.InventoryView;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when a player takes the result item out of an anvil
|
|
+ */
|
|
+public class AnvilTakeResultEvent extends InventoryEvent {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+ private final Player player;
|
|
+ private final ItemStack result;
|
|
+
|
|
+ public AnvilTakeResultEvent(@NotNull HumanEntity player, @NotNull InventoryView view, @NotNull ItemStack result) {
|
|
+ super(view);
|
|
+ this.player = (Player) player;
|
|
+ this.result = result;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public Player getPlayer() {
|
|
+ return player;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public ItemStack getResult() {
|
|
+ return result;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public AnvilInventory getInventory() {
|
|
+ return (AnvilInventory) super.getInventory();
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
|
|
new file mode 100644
|
|
index 00000000..2717ad82
|
|
--- /dev/null
|
|
+++ b/src/main/java/net/pl3x/purpur/event/inventory/AnvilUpdateResultEvent.java
|
|
@@ -0,0 +1,35 @@
|
|
+package net.pl3x.purpur.event.inventory;
|
|
+
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.inventory.InventoryEvent;
|
|
+import org.bukkit.inventory.AnvilInventory;
|
|
+import org.bukkit.inventory.InventoryView;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Called when anvil slots change, triggering the result slot to be updated
|
|
+ */
|
|
+public class AnvilUpdateResultEvent extends InventoryEvent {
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
+
|
|
+ public AnvilUpdateResultEvent(@NotNull InventoryView view) {
|
|
+ super(view);
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public AnvilInventory getInventory() {
|
|
+ return (AnvilInventory) super.getInventory();
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
|
|
index b95e563b..435026e5 100644
|
|
--- a/src/main/java/org/bukkit/inventory/AnvilInventory.java
|
|
+++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java
|
|
@@ -109,4 +109,14 @@ public interface AnvilInventory extends Inventory {
|
|
setItem(2, result);
|
|
}
|
|
// Paper end
|
|
+
|
|
+ // Purpur start
|
|
+ boolean canBypassCost();
|
|
+
|
|
+ void setBypassCost(boolean bypassCost);
|
|
+
|
|
+ boolean canDoUnsafeEnchants();
|
|
+
|
|
+ void setDoUnsafeEnchants(boolean canDoUnsafeEnchants);
|
|
+ // Purpur end
|
|
}
|
|
--
|
|
2.24.0
|
|
|