mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 15:49:00 +01:00
3d9d0a7227
- Lots of itemstack cloning removed. Only clone if the item is actually moved - Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items. However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on. - Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory - Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
40 lines
No EOL
2 KiB
Diff
40 lines
No EOL
2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Thu, 18 Jan 2018 01:00:27 -0500
|
|
Subject: [PATCH] Optimize Hoppers
|
|
|
|
Adds data about what Item related methods were used in InventoryMoveItem event
|
|
so that the server can improve the performance of this event.
|
|
|
|
diff --git a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
|
|
index 06ec99ae..b44cc45b 100644
|
|
--- a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java
|
|
@@ -0,0 +0,0 @@ public class InventoryMoveItemEvent extends Event implements Cancellable {
|
|
private final Inventory destinationInventory;
|
|
private ItemStack itemStack;
|
|
private final boolean didSourceInitiate;
|
|
+ public boolean calledGetItem; // Paper
|
|
+ public boolean calledSetItem; // Paper
|
|
|
|
public InventoryMoveItemEvent(final Inventory sourceInventory, final ItemStack itemStack, final Inventory destinationInventory, final boolean didSourceInitiate) {
|
|
Validate.notNull(itemStack, "ItemStack cannot be null");
|
|
@@ -0,0 +0,0 @@ public class InventoryMoveItemEvent extends Event implements Cancellable {
|
|
* @return ItemStack
|
|
*/
|
|
public ItemStack getItem() {
|
|
- return itemStack.clone();
|
|
+ calledGetItem = true; // Paper - record this method was used for auto detection of mode
|
|
+ return itemStack; // Paper - Removed clone, handled better in Server
|
|
}
|
|
|
|
/**
|
|
@@ -0,0 +0,0 @@ public class InventoryMoveItemEvent extends Event implements Cancellable {
|
|
*/
|
|
public void setItem(ItemStack itemStack) {
|
|
Validate.notNull(itemStack, "ItemStack cannot be null. Cancel the event if you want nothing to be transferred.");
|
|
+ calledSetItem = true; // Paper - record this method was used for auto detection of mode
|
|
this.itemStack = itemStack.clone();
|
|
}
|
|
|
|
--
|