From f6008a43f58bbab89381fbcfc4e5313de74686a3 Mon Sep 17 00:00:00 2001 From: Zoey76 <zoey_76@msn.com> Date: Sat, 23 May 2015 16:51:01 -0300 Subject: [PATCH] Datapack part for L2J/L2J_Server@8e1f56f196f78af16a5427b691f40b061b0a6ea0 --- .../handlers/communityboard/ClanBoard.java | 5 ++--- .../handlers/communityboard/HomeBoard.java | 15 +++------------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/ClanBoard.java b/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/ClanBoard.java index f8a554d76c..24b8e618ba 100644 --- a/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/ClanBoard.java +++ b/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/ClanBoard.java @@ -217,9 +217,8 @@ public class ClanBoard implements IWriteBoardHandler } i = 0; - int nbp; - nbp = ClanTable.getInstance().getClans().length / 8; - if ((nbp * 8) != ClanTable.getInstance().getClans().length) + int nbp = ClanTable.getInstance().getClanCount() / 8; + if ((nbp * 8) != ClanTable.getInstance().getClanCount()) { nbp++; } diff --git a/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/HomeBoard.java b/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/HomeBoard.java index 24e4920b4a..29e36f75ba 100644 --- a/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/HomeBoard.java +++ b/L2J_DataPack/dist/game/data/scripts/handlers/communityboard/HomeBoard.java @@ -58,9 +58,9 @@ public final class HomeBoard implements IParseBoardHandler CommunityBoardHandler.getInstance().addBypass(activeChar, "Home", command); String html = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/CommunityBoard/home.html"); - html = html.replaceAll("%fav_count%", String.valueOf(getFavoriteCount(activeChar))); - html = html.replaceAll("%region_count%", String.valueOf(getRegionCount(activeChar))); - html = html.replaceAll("%clan_count%", String.valueOf(getClansCount())); + html = html.replaceAll("%fav_count%", Integer.toString(getFavoriteCount(activeChar))); + html = html.replaceAll("%region_count%", Integer.toString(getRegionCount(activeChar))); + html = html.replaceAll("%clan_count%", Integer.toString(ClanTable.getInstance().getClanCount())); CommunityBoardHandler.separateAndSend(html, activeChar); } else if (command.startsWith("_bbstop;")) @@ -111,13 +111,4 @@ public final class HomeBoard implements IParseBoardHandler { return 0; // TODO: Implement. } - - /** - * Gets the clans count. - * @return the clans count - */ - private static int getClansCount() - { - return ClanTable.getInstance().getClans().length; - } } -- GitLab