From 99d325137ab1bb82e5a0a653c5b87abcfc9a7584 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Fri, 3 Jul 2015 20:56:25 -0300
Subject: [PATCH] Minor NPE fix in Little Wings Big Adventure (421) quest

Reported by: JMD
---
 .../Q00421_LittleWingsBigAdventure.java         | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
index df7cb0832c..91dfdfc649 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java
@@ -89,6 +89,15 @@ public final class Q00421_LittleWingsBigAdventure extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
+		if ("DESPAWN_GUARDIAN".equals(event))
+		{
+			if (npc != null)
+			{
+				npc.deleteMe();
+			}
+			return super.onAdvEvent(event, npc, player);
+		}
+		
 		final QuestState qs = getQuestState(player, false);
 		String htmltext = null;
 		if (qs == null)
@@ -172,14 +181,6 @@ public final class Q00421_LittleWingsBigAdventure extends Quest
 				htmltext = event;
 				break;
 			}
-			case "DESPAWN_GUARDIAN":
-			{
-				if (npc != null)
-				{
-					npc.deleteMe();
-				}
-				break;
-			}
 		}
 		return htmltext;
 	}
-- 
GitLab