From 3df39f273f9cb59228076ede661d996efb4c27ea Mon Sep 17 00:00:00 2001 From: Cekis Date: Fri, 3 Feb 2017 15:23:54 +0000 Subject: [PATCH] Prevented null pointer when the lotto winner (group lottery) cannot be determined or is incorrectly chosen. --- .../compiled/game/script/corpse/ai_corpse.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sku.0/sys.server/compiled/game/script/corpse/ai_corpse.java b/sku.0/sys.server/compiled/game/script/corpse/ai_corpse.java index efac37020..4ec35193b 100755 --- a/sku.0/sys.server/compiled/game/script/corpse/ai_corpse.java +++ b/sku.0/sys.server/compiled/game/script/corpse/ai_corpse.java @@ -414,12 +414,14 @@ public class ai_corpse extends script.base_script proseParameters.put("stf", group.GROUP_STF); proseParameters.put("message", transferProblem); proseParameters.put("TO", item); - proseParameters.put("TT", lottoWinner); - obj_id gid = getGroupObject(lottoWinner); - obj_id[] members = utils.getLocalGroupMemberIds(gid); - if(members != null) { - for (int x = 0; x < members.length; ++x) { - messageTo(members[x], "sendSystemMessageProseAuthoritative", proseParameters, 1, true); + if(isValidId(lottoWinner)) { + proseParameters.put("TT", lottoWinner); + obj_id gid = getGroupObject(lottoWinner); + obj_id[] members = utils.getLocalGroupMemberIds(gid); + if (members != null) { + for (int x = 0; x < members.length; ++x) { + messageTo(members[x], "sendSystemMessageProseAuthoritative", proseParameters, 1, true); + } } } allTransfersComplete = false;