Skip to content

Commit 20044a7

Browse files
authored
fix: re-enable no snapshot inventories (#1972)
1 parent 8bc7ff4 commit 20044a7

1 file changed

Lines changed: 4 additions & 15 deletions

File tree

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -165,17 +165,6 @@ public class EventAbstractionListener extends AbstractListener {
165165
private final EventDebounce<BlockPistonRetractKey> pistonRetractDebounce = EventDebounce.create(5000);
166166
private final EventDebounce<BlockPistonExtendKey> pistonExtendDebounce = EventDebounce.create(5000);
167167

168-
private static final boolean HAS_SNAPSHOT_INVHOLDER;
169-
static {
170-
boolean temp;
171-
try {
172-
Inventory.class.getMethod("getHolder", boolean.class);
173-
temp = true;
174-
} catch (NoSuchMethodException e) {
175-
temp = false;
176-
}
177-
HAS_SNAPSHOT_INVHOLDER = temp;
178-
}
179168
/**
180169
* Construct the listener.
181170
*
@@ -964,7 +953,7 @@ public void onInventoryOpen(InventoryOpenEvent event) {
964953
@EventHandler(ignoreCancelled = true)
965954
public void onInventoryMoveItem(InventoryMoveItemEvent event) {
966955
InventoryHolder causeHolder;
967-
if (HAS_SNAPSHOT_INVHOLDER) {
956+
if (PaperLib.isPaper()) {
968957
causeHolder = event.getInitiator().getHolder(false);
969958
} else {
970959
causeHolder = event.getInitiator().getHolder();
@@ -984,13 +973,13 @@ public void onInventoryMoveItem(InventoryMoveItemEvent event) {
984973
if ((entry = moveItemDebounce.tryDebounce(event)) != null) {
985974
InventoryHolder sourceHolder;
986975
InventoryHolder targetHolder;
987-
/*if (HAS_SNAPSHOT_INVHOLDER) {
976+
if (PaperLib.isPaper()) {
988977
sourceHolder = event.getSource().getHolder(false);
989978
targetHolder = event.getDestination().getHolder(false);
990-
} else {*/
979+
} else {
991980
sourceHolder = event.getSource().getHolder();
992981
targetHolder = event.getDestination().getHolder();
993-
//}
982+
}
994983

995984
Cause cause;
996985

0 commit comments

Comments
 (0)