diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java index 614ef4f129..3a6257aaa3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java @@ -2260,7 +2260,7 @@ public class Config DIFFERENT_Z_CHANGE_OBJECT = Integer.parseInt(CustomServerSettings.getProperty("DifferentZchangeObject", "650")); DIFFERENT_Z_NEW_MOVIE = Integer.parseInt(CustomServerSettings.getProperty("DifferentZnewmovie", "1000")); - ALLOW_SIMPLE_STATS_VIEW = Boolean.parseBoolean(CustomServerSettings.getProperty("AllowSimpleStatsView", "true")); + ALLOW_SIMPLE_STATS_VIEW = Boolean.parseBoolean(CustomServerSettings.getProperty("AllowSimpleStatsView", "false")); ALLOW_DETAILED_STATS_VIEW = Boolean.parseBoolean(CustomServerSettings.getProperty("AllowDetailedStatsView", "false")); ALLOW_ONLINE_VIEW = Boolean.parseBoolean(CustomServerSettings.getProperty("AllowOnlineView", "false")); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java index cd84724414..3a2d251213 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AdminCommandHandler.java @@ -101,74 +101,75 @@ public class AdminCommandHandler private AdminCommandHandler() { _datatable = new HashMap<>(); + registerAdminCommandHandler(new AdminAdmin()); - registerAdminCommandHandler(new AdminInvul()); - registerAdminCommandHandler(new AdminDelete()); - registerAdminCommandHandler(new AdminKill()); - registerAdminCommandHandler(new AdminTarget()); - registerAdminCommandHandler(new AdminShop()); - registerAdminCommandHandler(new AdminCTFEngine()); - registerAdminCommandHandler(new AdminVIPEngine()); - registerAdminCommandHandler(new AdminDMEngine()); + registerAdminCommandHandler(new AdminAio()); registerAdminCommandHandler(new AdminAnnouncements()); - registerAdminCommandHandler(new AdminCreateItem()); - registerAdminCommandHandler(new AdminHeal()); - registerAdminCommandHandler(new AdminHelpPage()); - registerAdminCommandHandler(new AdminShutdown()); - registerAdminCommandHandler(new AdminSpawn()); - registerAdminCommandHandler(new AdminSkill()); - registerAdminCommandHandler(new AdminScript()); - registerAdminCommandHandler(new AdminExpSp()); - registerAdminCommandHandler(new AdminEventEngine()); - registerAdminCommandHandler(new AdminFence()); - registerAdminCommandHandler(new AdminGmChat()); - registerAdminCommandHandler(new AdminGmSpeed()); - registerAdminCommandHandler(new AdminHide()); - registerAdminCommandHandler(new AdminSuperHaste()); - registerAdminCommandHandler(new AdminEditChar()); - registerAdminCommandHandler(new AdminGm()); - registerAdminCommandHandler(new AdminTeleport()); - registerAdminCommandHandler(new AdminRepairChar()); + registerAdminCommandHandler(new AdminBan()); + registerAdminCommandHandler(new AdminBuffs()); + registerAdminCommandHandler(new AdminCache()); registerAdminCommandHandler(new AdminChangeAccessLevel()); registerAdminCommandHandler(new AdminChristmas()); - registerAdminCommandHandler(new AdminBan()); - registerAdminCommandHandler(new AdminPolymorph()); - registerAdminCommandHandler(new AdminReload()); - registerAdminCommandHandler(new AdminKick()); - registerAdminCommandHandler(new AdminMonsterRace()); + registerAdminCommandHandler(new AdminCreateItem()); + registerAdminCommandHandler(new AdminCTFEngine()); + registerAdminCommandHandler(new AdminCursedWeapons()); + registerAdminCommandHandler(new AdminDelete()); + registerAdminCommandHandler(new AdminDMEngine()); + registerAdminCommandHandler(new AdminDonator()); + registerAdminCommandHandler(new AdminDoorControl()); + registerAdminCommandHandler(new AdminEditChar()); registerAdminCommandHandler(new AdminEditNpc()); + registerAdminCommandHandler(new AdminEffects()); + registerAdminCommandHandler(new AdminEnchant()); + registerAdminCommandHandler(new AdminEventEngine()); + registerAdminCommandHandler(new AdminExpSp()); + registerAdminCommandHandler(new AdminFence()); registerAdminCommandHandler(new AdminFightCalculator()); - registerAdminCommandHandler(new AdminMenu()); - registerAdminCommandHandler(new AdminSiege()); registerAdminCommandHandler(new AdminFortSiege()); + registerAdminCommandHandler(new AdminGeodata()); + registerAdminCommandHandler(new AdminGm()); + registerAdminCommandHandler(new AdminGmChat()); + registerAdminCommandHandler(new AdminGmSpeed()); + registerAdminCommandHandler(new AdminHeal()); + registerAdminCommandHandler(new AdminHelpPage()); + registerAdminCommandHandler(new AdminHide()); + registerAdminCommandHandler(new AdminInvul()); + registerAdminCommandHandler(new AdminKick()); + registerAdminCommandHandler(new AdminKill()); + registerAdminCommandHandler(new AdminLevel()); + registerAdminCommandHandler(new AdminLogin()); + registerAdminCommandHandler(new AdminMammon()); + registerAdminCommandHandler(new AdminManor()); + registerAdminCommandHandler(new AdminMassControl()); + registerAdminCommandHandler(new AdminMassRecall()); + registerAdminCommandHandler(new AdminMenu()); + registerAdminCommandHandler(new AdminMobGroup()); + registerAdminCommandHandler(new AdminMonsterRace()); + registerAdminCommandHandler(new AdminNoble()); registerAdminCommandHandler(new AdminPetition()); registerAdminCommandHandler(new AdminPForge()); - registerAdminCommandHandler(new AdminEffects()); - registerAdminCommandHandler(new AdminDoorControl()); - registerAdminCommandHandler(new AdminTest()); - registerAdminCommandHandler(new AdminEnchant()); - registerAdminCommandHandler(new AdminMassRecall()); - registerAdminCommandHandler(new AdminMassControl()); - registerAdminCommandHandler(new AdminMobGroup()); - registerAdminCommandHandler(new AdminRes()); - registerAdminCommandHandler(new AdminMammon()); registerAdminCommandHandler(new AdminPledge()); - registerAdminCommandHandler(new AdminRideWyvern()); - registerAdminCommandHandler(new AdminLogin()); - registerAdminCommandHandler(new AdminCache()); - registerAdminCommandHandler(new AdminLevel()); + registerAdminCommandHandler(new AdminPolymorph()); registerAdminCommandHandler(new AdminQuest()); - registerAdminCommandHandler(new AdminZone()); - registerAdminCommandHandler(new AdminCursedWeapons()); - registerAdminCommandHandler(new AdminGeodata()); - registerAdminCommandHandler(new AdminManor()); + registerAdminCommandHandler(new AdminReload()); + registerAdminCommandHandler(new AdminRepairChar()); + registerAdminCommandHandler(new AdminRes()); + registerAdminCommandHandler(new AdminRideWyvern()); + registerAdminCommandHandler(new AdminScript()); + registerAdminCommandHandler(new AdminShop()); + registerAdminCommandHandler(new AdminShutdown()); + registerAdminCommandHandler(new AdminSiege()); + registerAdminCommandHandler(new AdminSkill()); + registerAdminCommandHandler(new AdminSpawn()); + registerAdminCommandHandler(new AdminSuperHaste()); + registerAdminCommandHandler(new AdminTarget()); + registerAdminCommandHandler(new AdminTeleport()); + registerAdminCommandHandler(new AdminTest()); registerAdminCommandHandler(new AdminTownWar()); registerAdminCommandHandler(new AdminTvTEngine()); - registerAdminCommandHandler(new AdminDonator()); - registerAdminCommandHandler(new AdminNoble()); - registerAdminCommandHandler(new AdminBuffs()); - registerAdminCommandHandler(new AdminAio()); + registerAdminCommandHandler(new AdminVIPEngine()); registerAdminCommandHandler(new AdminWho()); + registerAdminCommandHandler(new AdminZone()); LOGGER.info("AdminCommandHandler: Loaded " + _datatable.size() + " handlers."); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoAnnouncementHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoAnnouncementHandler.java index 1073d94c60..3606db93cf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoAnnouncementHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoAnnouncementHandler.java @@ -62,7 +62,6 @@ public class AutoAnnouncementHandler while (rs.next()) { numLoaded++; - registerGlobalAnnouncement(rs.getInt("id"), rs.getString("announcement"), rs.getLong("delay")); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoChatHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoChatHandler.java index 39973c2af6..f1df7e1d05 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoChatHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/AutoChatHandler.java @@ -72,17 +72,12 @@ public class AutoChatHandler implements SpawnListener rs2.last(); final String[] chatTexts = new String[rs2.getRow()]; - int i = 0; - rs2.first(); - while (rs2.next()) { - chatTexts[i] = rs2.getString("chatText"); - i++; + chatTexts[i++] = rs2.getString("chatText"); } - registerGlobalChat(rs.getInt("npcId"), chatTexts, rs.getLong("chatDelay")); statement2.close(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/ItemHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/ItemHandler.java index ff9c05937a..281e182903 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/ItemHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/ItemHandler.java @@ -16,8 +16,8 @@ */ package org.l2jmobius.gameserver.handler; +import java.util.HashMap; import java.util.Map; -import java.util.TreeMap; import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.itemhandlers.BeastSoulShot; @@ -78,54 +78,53 @@ public class ItemHandler return _datatable.size(); } - /** - * Constructor of ItemHandler - */ private ItemHandler() { - _datatable = new TreeMap<>(); - registerItemHandler(new ScrollOfEscape()); - registerItemHandler(new ScrollOfResurrection()); - registerItemHandler(new SoulShots()); - registerItemHandler(new SpiritShot()); - registerItemHandler(new BlessedSpiritShot()); + _datatable = new HashMap<>(); + registerItemHandler(new BeastSoulShot()); + registerItemHandler(new BeastSpice()); registerItemHandler(new BeastSpiritShot()); + registerItemHandler(new BlessedSpiritShot()); + registerItemHandler(new Book()); + registerItemHandler(new BreakingArrow()); + registerItemHandler(new CharChangePotions()); registerItemHandler(new ChestKey()); + registerItemHandler(new ChristmasTree()); + registerItemHandler(new CrystalCarol()); + registerItemHandler(new Crystals()); registerItemHandler(new CustomPotions()); - registerItemHandler(new PaganKeys()); - registerItemHandler(new Maps()); - registerItemHandler(new MapForestOfTheDead()); - registerItemHandler(new Potions()); - registerItemHandler(new Recipes()); - registerItemHandler(new RollingDice()); - registerItemHandler(new MysteryPotion()); registerItemHandler(new EnchantScrolls()); registerItemHandler(new EnergyStone()); - registerItemHandler(new Book()); - registerItemHandler(new Remedy()); - registerItemHandler(new Scrolls()); - registerItemHandler(new CrystalCarol()); - registerItemHandler(new SoulCrystals()); - registerItemHandler(new SevenSignsRecord()); - registerItemHandler(new CharChangePotions()); - registerItemHandler(new Firework()); - registerItemHandler(new Seed()); - registerItemHandler(new Harvester()); - registerItemHandler(new MercTicket()); - registerItemHandler(new Nectar()); - registerItemHandler(new FishShots()); registerItemHandler(new ExtractableItems()); - registerItemHandler(new SpecialXMas()); - registerItemHandler(new SummonItems()); - registerItemHandler(new BeastSpice()); - registerItemHandler(new JackpotSeed()); - registerItemHandler(new NobleCustomItem()); + registerItemHandler(new Firework()); + registerItemHandler(new FishShots()); + registerItemHandler(new Harvester()); registerItemHandler(new HeroCustomItem()); + registerItemHandler(new JackpotSeed()); + registerItemHandler(new MapForestOfTheDead()); + registerItemHandler(new Maps()); + registerItemHandler(new MercTicket()); registerItemHandler(new MOSKey()); - registerItemHandler(new BreakingArrow()); - registerItemHandler(new ChristmasTree()); - registerItemHandler(new Crystals()); + registerItemHandler(new MysteryPotion()); + registerItemHandler(new Nectar()); + registerItemHandler(new NobleCustomItem()); + registerItemHandler(new PaganKeys()); + registerItemHandler(new Potions()); + registerItemHandler(new Recipes()); + registerItemHandler(new Remedy()); + registerItemHandler(new RollingDice()); + registerItemHandler(new ScrollOfEscape()); + registerItemHandler(new ScrollOfResurrection()); + registerItemHandler(new Scrolls()); + registerItemHandler(new Seed()); + registerItemHandler(new SevenSignsRecord()); + registerItemHandler(new SoulCrystals()); + registerItemHandler(new SoulShots()); + registerItemHandler(new SpecialXMas()); + registerItemHandler(new SpiritShot()); + registerItemHandler(new SummonItems()); + LOGGER.info("ItemHandler: Loaded " + _datatable.size() + " handlers."); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/SkillHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/SkillHandler.java index 2a70530e81..71fef34991 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/SkillHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/SkillHandler.java @@ -16,8 +16,8 @@ */ package org.l2jmobius.gameserver.handler; +import java.util.HashMap; import java.util.Map; -import java.util.TreeMap; import java.util.logging.Logger; import org.l2jmobius.gameserver.handler.skillhandlers.BalanceLife; @@ -64,41 +64,43 @@ public class SkillHandler private SkillHandler() { - _datatable = new TreeMap<>(); - registerSkillHandler(new Blow()); - registerSkillHandler(new Pdam()); - registerSkillHandler(new Mdam()); - registerSkillHandler(new CpDam()); - registerSkillHandler(new Manadam()); - registerSkillHandler(new Heal()); - registerSkillHandler(new CombatPointHeal()); - registerSkillHandler(new ManaHeal()); + _datatable = new HashMap<>(); + registerSkillHandler(new BalanceLife()); + registerSkillHandler(new BeastFeed()); + registerSkillHandler(new Blow()); registerSkillHandler(new Charge()); registerSkillHandler(new ClanGate()); + registerSkillHandler(new CombatPointHeal()); registerSkillHandler(new Continuous()); + registerSkillHandler(new CpDam()); + registerSkillHandler(new Craft()); + registerSkillHandler(new DeluxeKey()); + registerSkillHandler(new Disablers()); + registerSkillHandler(new DrainSoul()); + registerSkillHandler(new Fishing()); + registerSkillHandler(new FishingSkill()); + registerSkillHandler(new GetPlayer()); + registerSkillHandler(new Harvest()); + registerSkillHandler(new Heal()); + registerSkillHandler(new Manadam()); + registerSkillHandler(new ManaHeal()); + registerSkillHandler(new Mdam()); + registerSkillHandler(new Pdam()); + registerSkillHandler(new Recall()); registerSkillHandler(new Resurrect()); + registerSkillHandler(new SiegeFlag()); + registerSkillHandler(new Sow()); registerSkillHandler(new Spoil()); - registerSkillHandler(new Sweep()); registerSkillHandler(new StrSiegeAssault()); registerSkillHandler(new SummonFriend()); registerSkillHandler(new SummonTreasureKey()); - registerSkillHandler(new Disablers()); - registerSkillHandler(new Recall()); - registerSkillHandler(new SiegeFlag()); + registerSkillHandler(new Sweep()); registerSkillHandler(new TakeCastle()); registerSkillHandler(new Unlock()); - registerSkillHandler(new DrainSoul()); - registerSkillHandler(new Craft()); - registerSkillHandler(new Fishing()); - registerSkillHandler(new FishingSkill()); - registerSkillHandler(new BeastFeed()); - registerSkillHandler(new DeluxeKey()); - registerSkillHandler(new Sow()); - registerSkillHandler(new Harvest()); - registerSkillHandler(new GetPlayer()); registerSkillHandler(new ZakenPlayer()); registerSkillHandler(new ZakenSelf()); + LOGGER.info("SkillHandler: Loaded " + _datatable.size() + " handlers."); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/UserCommandHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/UserCommandHandler.java index 0a378551a9..3eeeb3c8a2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/UserCommandHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/UserCommandHandler.java @@ -45,10 +45,9 @@ public class UserCommandHandler private UserCommandHandler() { _datatable = new HashMap<>(); - registerUserCommandHandler(new Time()); - registerUserCommandHandler(new OlympiadStat()); - registerUserCommandHandler(new ChannelLeave()); + registerUserCommandHandler(new ChannelDelete()); + registerUserCommandHandler(new ChannelLeave()); registerUserCommandHandler(new ChannelListUpdate()); registerUserCommandHandler(new ClanPenalty()); registerUserCommandHandler(new ClanWarsList()); @@ -56,12 +55,16 @@ public class UserCommandHandler registerUserCommandHandler(new Escape()); registerUserCommandHandler(new Loc()); registerUserCommandHandler(new Mount()); + registerUserCommandHandler(new OlympiadStat()); registerUserCommandHandler(new PartyInfo()); registerUserCommandHandler(new SiegeStatus()); + registerUserCommandHandler(new Time()); + if (Config.OFFLINE_TRADE_ENABLE && Config.OFFLINE_COMMAND1) { registerUserCommandHandler(new OfflineShop()); } + LOGGER.info("UserCommandHandler: Loaded " + _datatable.size() + " handlers."); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java index ba04639355..4fc436f2d9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java @@ -29,7 +29,6 @@ import org.l2jmobius.gameserver.handler.voicedcommandhandlers.OfflineShop; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.Online; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.StatsCmd; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.TvTCmd; -import org.l2jmobius.gameserver.handler.voicedcommandhandlers.Voting; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.Wedding; public class VoicedCommandHandler @@ -42,8 +41,6 @@ public class VoicedCommandHandler { _datatable = new HashMap<>(); - registerVoicedCommandHandler(new Voting()); - if (Config.BANKING_SYSTEM_ENABLED) { registerVoicedCommandHandler(new BankingCmd()); @@ -69,7 +66,10 @@ public class VoicedCommandHandler registerVoicedCommandHandler(new Wedding()); } - registerVoicedCommandHandler(new StatsCmd()); + if (Config.ALLOW_SIMPLE_STATS_VIEW || Config.ALLOW_DETAILED_STATS_VIEW) + { + registerVoicedCommandHandler(new StatsCmd()); + } if (Config.ALLOW_FARM1_COMMAND || Config.ALLOW_FARM2_COMMAND || Config.ALLOW_PVP1_COMMAND || Config.ALLOW_PVP2_COMMAND) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/FarmPvpCmd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/FarmPvpCmd.java index b82b5c320d..c5837c1dc2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/FarmPvpCmd.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/FarmPvpCmd.java @@ -76,37 +76,37 @@ public class FarmPvpCmd implements IVoicedCommandHandler if (activeChar.isInJail()) { - activeChar.sendMessage("Sorry,you are in Jail!"); + activeChar.sendMessage("Sorry, you are in Jail!"); return false; } else if (activeChar.isInOlympiadMode()) { - activeChar.sendMessage("Sorry,you are in the Olympiad now."); + activeChar.sendMessage("Sorry, you are in the Olympiad now."); return false; } else if (activeChar.isInFunEvent()) { - activeChar.sendMessage("Sorry,you are in an event."); + activeChar.sendMessage("Sorry, you are in an event."); return false; } else if (activeChar.isInDuel()) { - activeChar.sendMessage("Sorry,you are in a duel!"); + activeChar.sendMessage("Sorry, you are in a duel!"); return false; } else if (activeChar.inObserverMode()) { - activeChar.sendMessage("Sorry,you are in the observation mode."); + activeChar.sendMessage("Sorry, you are in the observation mode."); return false; } else if (activeChar.isFestivalParticipant()) { - activeChar.sendMessage("Sorry,you are in a festival."); + activeChar.sendMessage("Sorry, you are in a festival."); return false; } else if (!Config.ALT_GAME_KARMA_PLAYER_CAN_USE_GK && (activeChar.getKarma() > 0)) { - activeChar.sendMessage("Sorry,you are PK"); + activeChar.sendMessage("Sorry, you are PK"); return false; } else if (Olympiad.getInstance().isRegistered(activeChar)) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/StatsCmd.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/StatsCmd.java index 24fb906741..0ace0e6eb6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/StatsCmd.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/StatsCmd.java @@ -39,7 +39,6 @@ public class StatsCmd implements IVoicedCommandHandler public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target) { final CommandEnum comm = CommandEnum.valueOf(command); - if (comm == null) { return false; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Voting.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Voting.java deleted file mode 100644 index e49ee46523..0000000000 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Voting.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * This file is part of the L2J Mobius project. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.l2jmobius.gameserver.handler.voicedcommandhandlers; - -import org.l2jmobius.gameserver.handler.IVoicedCommandHandler; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; - -public class Voting implements IVoicedCommandHandler -{ - private static String[] _voicedCommands = - { - "vote", - "votePoints", - "getVoteReward", - "voteTime" - }; - - @Override - public boolean useVoicedCommand(String command, PlayerInstance activeChar, String target) - { - // flood protection - long currentTime = System.currentTimeMillis(); - if (activeChar.getVoteTimestamp() > currentTime) - { - activeChar.sendMessage("You can't use Voting system soo fast!"); - } - else - { - currentTime += 1000; - activeChar.setVoteTimestamp(currentTime); - } - - if (command.equalsIgnoreCase("vote")) - { - activeChar.sendMessage(".votePoints - tells how many points has been accumulated."); - activeChar.sendMessage(".getVoteReward - converts vote points to a reward."); - activeChar.sendMessage(".voteTime - tells will you be able to vote next time."); - } - else if (command.equalsIgnoreCase("votePoints")) - { - final int votePoints = activeChar.getVotePoints(); - activeChar.sendMessage("You've collected " + votePoints + "."); - } - else if (command.equalsIgnoreCase("voteTime")) - { - final int voteTime = activeChar.getVoteTime(); - currentTime /= 1000; - if ((voteTime + 43200) > currentTime) - { - int secLeft = (int) ((voteTime + 43200) - currentTime); - int minutesLeft = secLeft / 60; - secLeft %= 60; - final int hoursLeft = minutesLeft / 60; - minutesLeft %= 60; - - activeChar.sendMessage("You'll be able to vote in " + hoursLeft + " hour(s) and " + minutesLeft + " minute(s)."); - } - else - { - activeChar.sendMessage("You can vote now."); - } - } - else if (command.equalsIgnoreCase("getVoteReward")) - { - final int votePoints = activeChar.getVotePoints(); - if (votePoints > 0) - { - activeChar.setVotePoints(0); - activeChar.addItem("VoteReward", 4356, votePoints, activeChar, true); - } - else - { - activeChar.sendMessage("You've got not enough vote points."); - } - } - return true; - } - - @Override - public String[] getVoicedCommandList() - { - return _voicedCommands; - } -} \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java index c39abd2003..aa65156d5e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java @@ -59,7 +59,7 @@ public class Wedding implements IVoicedCommandHandler if (activeChar.isInFunEvent() || activeChar.isInOlympiadMode()) { - activeChar.sendMessage("Sorry,you are in event now."); + activeChar.sendMessage("Sorry, you are in an event now."); return false; }