From 42715de2659c5e27ff1d3d8fb22c654947e415e2 Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Mon, 31 Aug 2020 00:28:12 +0200
Subject: [PATCH] getExistingEntityTypeId should return Integer instead of int

Fixes #804
---
 src/main/java/de/diddiz/LogBlock/EntityTypeConverter.java | 2 +-
 src/main/java/de/diddiz/LogBlock/QueryParams.java         | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/diddiz/LogBlock/EntityTypeConverter.java b/src/main/java/de/diddiz/LogBlock/EntityTypeConverter.java
index 8a99d50..c1fcc59 100644
--- a/src/main/java/de/diddiz/LogBlock/EntityTypeConverter.java
+++ b/src/main/java/de/diddiz/LogBlock/EntityTypeConverter.java
@@ -16,7 +16,7 @@ public class EntityTypeConverter {
     private static HashMap<EntityType, Integer> entityTypeToId = new HashMap<>();
     private static int nextEntityTypeId;
 
-    public synchronized static int getExistingEntityTypeId(EntityType entityType) {
+    public synchronized static Integer getExistingEntityTypeId(EntityType entityType) {
         return entityType == null ? null : entityTypeToId.get(entityType);
     }
 
diff --git a/src/main/java/de/diddiz/LogBlock/QueryParams.java b/src/main/java/de/diddiz/LogBlock/QueryParams.java
index e3a1035..9bf6894 100644
--- a/src/main/java/de/diddiz/LogBlock/QueryParams.java
+++ b/src/main/java/de/diddiz/LogBlock/QueryParams.java
@@ -1043,8 +1043,9 @@ public final class QueryParams implements Cloneable {
     private Set<Integer> getEntityTypeIds() {
         HashSet<Integer> typeIds = new HashSet<>();
         for (EntityType type : entityTypes) {
-            if (type != null) {
-                typeIds.add(EntityTypeConverter.getExistingEntityTypeId(type));
+            Integer id = EntityTypeConverter.getExistingEntityTypeId(type);
+            if (id != null) {
+                typeIds.add(id);
             }
         }
         // add invalid id, so the type list is not ignored