BETA: Minor cleanup for [8866].

1c98615a · Zoey76 · fe286e1a · 1c98615a · 1c98615a · 1c98615a
Commit 1c98615a authored 12 years ago by Zoey76
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/9001-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/9001-04.htm
+<html><body>
+You must be in Clan.
+</body></html>
\ No newline at end of file
--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/Alliance.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/Alliance.java
@@ -57,12 +57,11 @@ public class Alliance extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		String htmltext = event;
 		if (!"9001-01.htm".equals(event) && player.getClan() == null)
 		{
-			htmltext = "<html><body>You must be in Clan.</body></html>";
+			return "9001-04.htm";
 		}
-		return htmltext;
+		return event;
 	}
 	public static void main(String[] args)

--- a/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/Clan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Clan/Clan.java
@@ -77,15 +77,14 @@ public class Clan extends Quest
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
-		String htmltext = event;
 		if (LEADER_REQUIRED.containsKey(event))
 		{
-			if (player.getClan() == null || !player.isClanLeader())
+			if (!player.isClanLeader())
 			{
-				htmltext = LEADER_REQUIRED.get(event);
+				return LEADER_REQUIRED.get(event);
 			}
 		}
-		return htmltext;
+		return event;
 	}
 	public static void main(String[] args)