C6 Clan_Notice vs WELCOME_HTM

[caioconc]

when you have the welcome do not have the notice clan on screen..

Code: [Select]

diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index c0364aa..18600f2 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -172,6 +172,21 @@
  html.replace("%notice_text%", player.getClan().getNotice().replaceAll("\r\n", "<br>").replaceAll("action", "").replace("bypass", ""));
  sendPacket(html);
  }
+ else
+ {
+ if (Config.WELCOME_HTM && isValidName(player.getName()))
+ {
+ final String Welcome_Path = "data/html/welcome.htm";
+ final File mainText = new File(Config.DATAPACK_ROOT, Welcome_Path);
+ if (mainText.exists())
+ {
+ final NpcHtmlMessage html = new NpcHtmlMessage(1);
+ html.setFile(Welcome_Path);
+ html.replace("%name%", player.getName());
+ sendPacket(html);
+ }
+ }
+ }
  }
 
  if (Config.PLAYER_SPAWN_PROTECTION > 0)
@@ -631,19 +646,6 @@
  player.updateFirstLog();
  }
 
- if (Config.WELCOME_HTM && isValidName(player.getName()))
- {
- final String Welcome_Path = "data/html/welcome.htm";
- final File mainText = new File(Config.DATAPACK_ROOT, Welcome_Path);
- if (mainText.exists())
- {
- final NpcHtmlMessage html = new NpcHtmlMessage(1);
- html.setFile(Welcome_Path);
- html.replace("%name%", player.getName());
- sendPacket(html);
- }
- }
-
  if (Config.PM_MESSAGE_ON_START)
  {
  player.sendPacket(new CreatureSay(2, ChatType.HERO_VOICE, Config.PM_TEXT1, Config.PM_SERVER_NAME));