From 39f20a099d53428b2534a24ad78ac46774ec8ae1 Mon Sep 17 00:00:00 2001 From: Grafe Date: Sun, 7 Apr 2013 20:26:24 +0200 Subject: [PATCH] Fixed npe Signed-off-by: Grafe --- src/com/dre/dungeonsxl/listener/BlockListener.java | 8 +++++--- src/com/dre/dungeonsxl/signs/SIGNTrigger.java | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/com/dre/dungeonsxl/listener/BlockListener.java b/src/com/dre/dungeonsxl/listener/BlockListener.java index e5cad717..86bffa6c 100644 --- a/src/com/dre/dungeonsxl/listener/BlockListener.java +++ b/src/com/dre/dungeonsxl/listener/BlockListener.java @@ -201,9 +201,11 @@ public class BlockListener implements Listener { for(GameWorld gworld : GameWorld.gworlds){ if(event.getBlock().getWorld() == gworld.world){ for(DSign sign : gworld.dSigns){ - if(sign.isRedstoneTrigger()){ - if(sign.getRtBlock().isBlockPowered()){ - sign.onTrigger(); + if(sign!=null){ + if(sign.isRedstoneTrigger()){ + if(sign.getRtBlock().isBlockPowered()){ + sign.onTrigger(); + } } } } diff --git a/src/com/dre/dungeonsxl/signs/SIGNTrigger.java b/src/com/dre/dungeonsxl/signs/SIGNTrigger.java index a7378607..73397f50 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNTrigger.java +++ b/src/com/dre/dungeonsxl/signs/SIGNTrigger.java @@ -34,9 +34,11 @@ public class SIGNTrigger extends DSign{ public void onTrigger() { if(initialized){ for(DSign dsign : this.gworld.dSigns){ - if(dsign.isSignTrigger()){ - if(triggerId == dsign.getStId()){ - dsign.onTrigger(); + if(dsign != null){ + if(dsign.isSignTrigger()){ + if(triggerId == dsign.getStId()){ + dsign.onTrigger(); + } } } }