From 18ee02f16976f6dad9faac9b2679fdf5cab4e579 Mon Sep 17 00:00:00 2001 From: Daniel Saukel Date: Sat, 18 Apr 2020 15:14:27 +0200 Subject: [PATCH] Remove unnecessary check. null-safety should be ensured in Caliburn; resolves #689 --- .../java/de/erethon/dungeonsxl/trigger/TriggerListener.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/src/main/java/de/erethon/dungeonsxl/trigger/TriggerListener.java b/core/src/main/java/de/erethon/dungeonsxl/trigger/TriggerListener.java index 8f637243..a1a5e213 100644 --- a/core/src/main/java/de/erethon/dungeonsxl/trigger/TriggerListener.java +++ b/core/src/main/java/de/erethon/dungeonsxl/trigger/TriggerListener.java @@ -86,10 +86,7 @@ public class TriggerListener implements Listener { } } if (name == null) { - ExItem exItem = plugin.getCaliburn().getExItem(item); - if (item != null) { - name = exItem.getName(); - } + name = plugin.getCaliburn().getExItem(item).getName(); } UseItemTrigger trigger = UseItemTrigger.getByName(name, gameWorld);