zhdev/griefus
1
0
Fork 0
Code Issues Pull requests Activity

Fixed a:+/-inventory displaying mixed results

Browse source
This commit is contained in:
Intelli 2022-02-10 19:57:30 -07:00
parent 54da739c1d
commit d5c2b908d3
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/coreprotect/command/CommandHandler.java
View file

@ -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")) { else if (argument.equals("-inv") || argument.equals("inv-") || argument.equals("-inventory") || argument.equals("inventory-") || argument.equals("-inventories")) {
result.add(4); result.add(4);
result.add(11); 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")) { else if (argument.equals("+inv") || argument.equals("inv+") || argument.equals("+inventory") || argument.equals("inventory+") || argument.equals("+inventories")) {
result.add(4); result.add(4);
result.add(11); result.add(11);
result.add(1); result.add(0);
} }
else if (argument.equals("item") || argument.equals("items")) { else if (argument.equals("item") || argument.equals("items")) {
result.add(11); result.add(11);

8
src/main/java/net/coreprotect/database/Lookup.java
View file

@ -453,13 +453,13 @@ public class Lookup extends Queue {
// If selecting from co_item & co_container, add in actions for both transaction types // If selecting from co_item & co_container, add in actions for both transaction types
if (actionList.contains(11) && actionList.contains(4)) { if (actionList.contains(11) && actionList.contains(4)) {
if (actionTarget == ItemLogger.ITEM_REMOVE) { 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_PICKUP);
actionText.append(",").append(ItemLogger.ITEM_REMOVE_ENDER); 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 // If just looking up drops/pickups, include ender chest transactions
else if (actionList.contains(11) && !actionList.contains(4)) { else if (actionList.contains(11) && !actionList.contains(4)) {