From 271d3c7e8331863b734837ff3985ef75e71eaee3 Mon Sep 17 00:00:00 2001 From: Robin Kupper Date: Sat, 6 Aug 2011 22:11:49 +0200 Subject: [PATCH] Made type param working with chestaccess params --- src/de/diddiz/LogBlock/CommandsHandler.java | 2 +- src/de/diddiz/LogBlock/QueryParams.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/de/diddiz/LogBlock/CommandsHandler.java b/src/de/diddiz/LogBlock/CommandsHandler.java index 8d62c35..f9bfe26 100644 --- a/src/de/diddiz/LogBlock/CommandsHandler.java +++ b/src/de/diddiz/LogBlock/CommandsHandler.java @@ -415,7 +415,7 @@ public class CommandsHandler implements CommandExecutor params.needPlayer = true; if (params.types.size() == 0 || params.types.contains(63) || params.types.contains(68)) params.needSignText = true; - if (params.types.size() == 0 || params.types.contains(23) || params.types.contains(54) || params.types.contains(61) || params.types.contains(62)) + if (params.types.size() == 0 || params.types.contains(23) || params.types.contains(54) || params.types.contains(61) || params.types.contains(62) || params.bct == BlockChangeType.CHESTACCESS) params.needChestAccess = true; if (params.limit < 0 && params.sum == SummarizationMode.NONE) params.limit = config.linesLimit; diff --git a/src/de/diddiz/LogBlock/QueryParams.java b/src/de/diddiz/LogBlock/QueryParams.java index ce6866c..757da6c 100644 --- a/src/de/diddiz/LogBlock/QueryParams.java +++ b/src/de/diddiz/LogBlock/QueryParams.java @@ -187,6 +187,13 @@ public class QueryParams implements Cloneable break; case CHESTACCESS: where.append("type = replaced AND (type = 23 OR type = 54 OR type = 61 OR type = 62) AND "); + if (!types.isEmpty()) { + where.append('('); + for (final int type : types) + where.append("itemtype = " + type + " OR "); + where.delete(where.length() - 4, where.length()); + where.append(") AND "); + } break; } if (!players.isEmpty() && sum != SummarizationMode.PLAYERS)