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 0000000000000000000000000000000000000000..5861afb0ba84365383448002b07e2d2f9b1e9013 --- /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 22c2726f20a5e3de3e64afb8ee0d8aff9d66d5e1..96e67fc3df794165be80c2ebc661720f60e8d1d3 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 e4416ead9d81f45a8b9496d040d9d44f1925649d..12d3d5f4a68e53e8bf17931838370408cd3575b7 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)