5b6dfb3463
This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
43 Zeilen
2.0 KiB
Diff
43 Zeilen
2.0 KiB
Diff
From 3d903c7ed998ce99c37f5b392021b982b9283955 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
|
|
@@ -30,6 +30,8 @@ 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");
|
|
@@ -55,7 +57,8 @@ 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
|
|
}
|
|
|
|
/**
|
|
@@ -67,6 +70,7 @@ 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();
|
|
}
|
|
|
|
--
|
|
2.18.0
|
|
|