From d5c2b908d31f881d730e365ca78b21be723ab791 Mon Sep 17 00:00:00 2001 From: Intelli Date: Thu, 10 Feb 2022 19:57:30 -0700 Subject: [PATCH] Fixed a:+/-inventory displaying mixed results --- src/main/java/net/coreprotect/command/CommandHandler.java | 4 ++-- src/main/java/net/coreprotect/database/Lookup.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/coreprotect/command/CommandHandler.java b/src/main/java/net/coreprotect/command/CommandHandler.java index 2124619..a2ce98c 100755 --- a/src/main/java/net/coreprotect/command/CommandHandler.java +++ b/src/main/java/net/coreprotect/command/CommandHandler.java @@ -127,12 +127,12 @@ public class CommandHandler implements CommandExecutor { else if (argument.equals("-inv") || argument.equals("inv-") || argument.equals("-inventory") || argument.equals("inventory-") || argument.equals("-inventories")) { result.add(4); result.add(11); - result.add(0); + result.add(1); } else if (argument.equals("+inv") || argument.equals("inv+") || argument.equals("+inventory") || argument.equals("inventory+") || argument.equals("+inventories")) { result.add(4); result.add(11); - result.add(1); + result.add(0); } else if (argument.equals("item") || argument.equals("items")) { result.add(11); diff --git a/src/main/java/net/coreprotect/database/Lookup.java b/src/main/java/net/coreprotect/database/Lookup.java index e4ec206..1813c98 100755 --- a/src/main/java/net/coreprotect/database/Lookup.java +++ b/src/main/java/net/coreprotect/database/Lookup.java @@ -453,13 +453,13 @@ public class Lookup extends Queue { // If selecting from co_item & co_container, add in actions for both transaction types if (actionList.contains(11) && actionList.contains(4)) { if (actionTarget == ItemLogger.ITEM_REMOVE) { - actionText.append(",").append(ItemLogger.ITEM_DROP); - actionText.append(",").append(ItemLogger.ITEM_ADD_ENDER); - } - if (actionTarget == ItemLogger.ITEM_ADD) { actionText.append(",").append(ItemLogger.ITEM_PICKUP); actionText.append(",").append(ItemLogger.ITEM_REMOVE_ENDER); } + if (actionTarget == ItemLogger.ITEM_ADD) { + actionText.append(",").append(ItemLogger.ITEM_DROP); + actionText.append(",").append(ItemLogger.ITEM_ADD_ENDER); + } } // If just looking up drops/pickups, include ender chest transactions else if (actionList.contains(11) && !actionList.contains(4)) {