From 1c98615aa4ebe3b10b18e7d3f0128dfdc73619af Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Wed, 30 May 2012 18:19:22 +0000
Subject: [PATCH] BETA: Minor cleanup for [8866].
---
.../game/data/scripts/village_master/Alliance/9001-04.htm | 3 +++
.../data/scripts/village_master/Alliance/Alliance.java | 5 ++---
.../dist/game/data/scripts/village_master/Clan/Clan.java | 7 +++----
3 files changed, 8 insertions(+), 7 deletions(-)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/9001-04.htm
diff --git 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
new file mode 100644
index 0000000000..5861afb0ba
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/village_master/Alliance/9001-04.htm
@@ -0,0 +1,3 @@
+<html><body>
+You must be in Clan.
+</body></html>
\ No newline at end of file
diff --git 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
index 22c2726f20..96e67fc3df 100644
--- 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)
diff --git 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
index e4416ead9d..12d3d5f4a6 100644
--- 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)
--
GitLab