From a9bba6c2edca39458ce304c5884a2e51eeffc181 Mon Sep 17 00:00:00 2001 From: Hendrik Brummermann Date: Sun, 13 Jun 2010 12:27:07 +0000 Subject: [PATCH] fixed NullPointerException in updatePlayerQuest (fixes #3015448) --- .../server/maps/nalwor/secretroom/DarkElvesCreatures.java | 2 +- src/games/stendhal/server/maps/nalwor/tunnel/DrowCreatures.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/games/stendhal/server/maps/nalwor/secretroom/DarkElvesCreatures.java b/src/games/stendhal/server/maps/nalwor/secretroom/DarkElvesCreatures.java index 4358953726..7f75bd15d0 100644 --- a/src/games/stendhal/server/maps/nalwor/secretroom/DarkElvesCreatures.java +++ b/src/games/stendhal/server/maps/nalwor/secretroom/DarkElvesCreatures.java @@ -55,7 +55,7 @@ public class DarkElvesCreatures implements ZoneConfigurator { } final Player player = (Player) killer; // check if player started his quest already - if(!player.getQuest(QUEST_SLOT, 0).equals("started")) { + if(!player.hasQuest(QUEST_SLOT) || !player.getQuest(QUEST_SLOT, 0).equals("started")) { return; } int slot=creatures.indexOf(victim); diff --git a/src/games/stendhal/server/maps/nalwor/tunnel/DrowCreatures.java b/src/games/stendhal/server/maps/nalwor/tunnel/DrowCreatures.java index 6ee8a02b45..0de88e032f 100644 --- a/src/games/stendhal/server/maps/nalwor/tunnel/DrowCreatures.java +++ b/src/games/stendhal/server/maps/nalwor/tunnel/DrowCreatures.java @@ -63,7 +63,7 @@ public class DrowCreatures implements ZoneConfigurator { } final Player player = (Player) killer; // check if player started his quest already - if(!player.getQuest(QUEST_SLOT, 0).equals("started")) { + if(!player.hasQuest(QUEST_SLOT) || !player.getQuest(QUEST_SLOT, 0).equals("started")) { return; } int slot=creatures.indexOf(victim);