From 66cf6694e36e1697eaa3fa2dcf1d25bf392f974f Mon Sep 17 00:00:00 2001 From: Cekis Date: Mon, 23 May 2016 02:47:28 +0100 Subject: [PATCH] Fixed null ptr issue if foolsDay config var setting is not in the cfg files. --- .../game/script/event/aprilfools/starport_april_fools.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sku.0/sys.server/compiled/game/script/event/aprilfools/starport_april_fools.java b/sku.0/sys.server/compiled/game/script/event/aprilfools/starport_april_fools.java index 205b50086..3ae3d8af7 100755 --- a/sku.0/sys.server/compiled/game/script/event/aprilfools/starport_april_fools.java +++ b/sku.0/sys.server/compiled/game/script/event/aprilfools/starport_april_fools.java @@ -28,7 +28,7 @@ public class starport_april_fools extends script.base_script public int heartbeat(obj_id self, dictionary params) throws InterruptedException { String foolsDayRunning = getConfigSetting("GameServer", "foolsDay"); - if(foolsDayRunning.equals("false") || foolsDayRunning.equals("0")){ + if(foolsDayRunning == null || foolsDayRunning.equals("false") || foolsDayRunning.equals("0")){ return SCRIPT_CONTINUE; } if (foolsDayRunning.length() <= 0)