From b6e4ce2ebf0e31d5656a5b18b73e7090f946ae93 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 8 Sep 2018 23:55:08 +0000 Subject: [PATCH] Removed boxing for String conversions. --- .../admincommandhandlers/AdminAnnouncements.java | 16 ++++++++-------- .../handlers/bypasshandlers/TerritoryStatus.java | 2 +- .../handlers/usercommandhandlers/Time.java | 4 ++-- .../Q00386_StolenDignity.java | 8 ++++---- .../Q00663_SeductiveWhispers.java | 2 +- .../l2jmobius/gameserver/model/actor/L2Npc.java | 2 +- .../actor/instance/FriendlyNpcInstance.java | 2 +- .../actor/instance/L2FishermanInstance.java | 2 +- .../model/actor/instance/L2GuardInstance.java | 2 +- .../model/actor/instance/L2MerchantInstance.java | 2 +- .../actor/instance/L2PetManagerInstance.java | 2 +- .../actor/instance/L2RaceManagerInstance.java | 14 +++++++------- .../actor/instance/L2VillageMasterInstance.java | 2 +- .../actor/instance/L2WarehouseInstance.java | 2 +- .../admincommandhandlers/AdminAnnouncements.java | 16 ++++++++-------- .../handlers/bypasshandlers/TerritoryStatus.java | 2 +- .../handlers/usercommandhandlers/Time.java | 4 ++-- .../Q00386_StolenDignity.java | 8 ++++---- .../Q00663_SeductiveWhispers.java | 2 +- .../Q10818_ConfrontingAGiantMonster.java | 14 +++++++------- .../l2jmobius/gameserver/model/actor/L2Npc.java | 2 +- .../actor/instance/FriendlyNpcInstance.java | 2 +- .../actor/instance/L2FishermanInstance.java | 2 +- .../model/actor/instance/L2GuardInstance.java | 2 +- .../model/actor/instance/L2MerchantInstance.java | 2 +- .../actor/instance/L2PetManagerInstance.java | 2 +- .../actor/instance/L2RaceManagerInstance.java | 14 +++++++------- .../actor/instance/L2VillageMasterInstance.java | 2 +- .../actor/instance/L2WarehouseInstance.java | 2 +- .../admincommandhandlers/AdminAnnouncements.java | 16 ++++++++-------- .../handlers/bypasshandlers/TerritoryStatus.java | 2 +- .../handlers/usercommandhandlers/Time.java | 4 ++-- .../Q00386_StolenDignity.java | 8 ++++---- .../Q00663_SeductiveWhispers.java | 2 +- .../Q10818_ConfrontingAGiantMonster.java | 14 +++++++------- .../l2jmobius/gameserver/model/actor/L2Npc.java | 2 +- .../actor/instance/FriendlyNpcInstance.java | 2 +- .../actor/instance/L2FishermanInstance.java | 2 +- .../model/actor/instance/L2GuardInstance.java | 2 +- .../model/actor/instance/L2MerchantInstance.java | 2 +- .../actor/instance/L2PetManagerInstance.java | 2 +- .../actor/instance/L2RaceManagerInstance.java | 14 +++++++------- .../actor/instance/L2VillageMasterInstance.java | 2 +- .../actor/instance/L2WarehouseInstance.java | 2 +- .../admincommandhandlers/AdminAnnouncements.java | 16 ++++++++-------- .../handlers/bypasshandlers/TerritoryStatus.java | 2 +- .../handlers/usercommandhandlers/Time.java | 4 ++-- .../Q00386_StolenDignity.java | 8 ++++---- .../Q00663_SeductiveWhispers.java | 2 +- .../Q10818_ConfrontingAGiantMonster.java | 14 +++++++------- .../l2jmobius/gameserver/model/actor/L2Npc.java | 2 +- .../actor/instance/FriendlyNpcInstance.java | 2 +- .../actor/instance/L2FishermanInstance.java | 2 +- .../model/actor/instance/L2GuardInstance.java | 2 +- .../model/actor/instance/L2MerchantInstance.java | 2 +- .../actor/instance/L2PetManagerInstance.java | 2 +- .../actor/instance/L2RaceManagerInstance.java | 14 +++++++------- .../actor/instance/L2VillageMasterInstance.java | 2 +- .../actor/instance/L2WarehouseInstance.java | 2 +- .../admincommandhandlers/AdminAnnouncements.java | 16 ++++++++-------- .../scripts/handlers/bypasshandlers/Loto.java | 14 +++++++------- .../handlers/bypasshandlers/TerritoryStatus.java | 2 +- .../handlers/usercommandhandlers/Time.java | 4 ++-- .../Q00384_WarehouseKeepersPastime.java | 8 ++++---- .../Q00386_StolenDignity.java | 8 ++++---- .../l2jmobius/gameserver/model/actor/L2Npc.java | 2 +- .../actor/instance/L2AdventurerInstance.java | 2 +- .../actor/instance/L2ClassMasterInstance.java | 2 +- .../instance/L2DungeonGatekeeperInstance.java | 2 +- .../actor/instance/L2FishermanInstance.java | 2 +- .../model/actor/instance/L2GuardInstance.java | 2 +- .../model/actor/instance/L2MerchantInstance.java | 2 +- .../actor/instance/L2PetManagerInstance.java | 2 +- .../actor/instance/L2RaceManagerInstance.java | 14 +++++++------- .../actor/instance/L2SchemeBufferInstance.java | 2 +- .../actor/instance/L2SepulcherNpcInstance.java | 2 +- .../actor/instance/L2TeleporterInstance.java | 2 +- .../model/actor/instance/L2TrainerInstance.java | 2 +- .../actor/instance/L2VillageMasterInstance.java | 2 +- .../actor/instance/L2WarehouseInstance.java | 2 +- .../admincommandhandlers/AdminAnnouncements.java | 16 ++++++++-------- .../handlers/bypasshandlers/TerritoryStatus.java | 2 +- .../handlers/usercommandhandlers/Time.java | 4 ++-- .../l2jmobius/gameserver/model/actor/L2Npc.java | 2 +- .../actor/instance/FriendlyNpcInstance.java | 2 +- .../actor/instance/L2FishermanInstance.java | 2 +- .../model/actor/instance/L2GuardInstance.java | 2 +- .../model/actor/instance/L2MerchantInstance.java | 2 +- .../actor/instance/L2PetManagerInstance.java | 2 +- .../actor/instance/L2SchemeBufferInstance.java | 2 +- .../actor/instance/L2VillageMasterInstance.java | 2 +- .../actor/instance/L2WarehouseInstance.java | 2 +- .../admincommandhandlers/AdminAnnouncements.java | 16 ++++++++-------- .../handlers/bypasshandlers/TerritoryStatus.java | 2 +- .../handlers/usercommandhandlers/Time.java | 4 ++-- .../l2jmobius/gameserver/model/actor/L2Npc.java | 2 +- .../actor/instance/FriendlyNpcInstance.java | 2 +- .../actor/instance/L2FishermanInstance.java | 2 +- .../model/actor/instance/L2GuardInstance.java | 2 +- .../model/actor/instance/L2MerchantInstance.java | 2 +- .../actor/instance/L2PetManagerInstance.java | 2 +- .../actor/instance/L2SchemeBufferInstance.java | 2 +- .../actor/instance/L2VillageMasterInstance.java | 2 +- .../actor/instance/L2WarehouseInstance.java | 2 +- .../admincommandhandlers/AdminAnnouncements.java | 16 ++++++++-------- .../handlers/bypasshandlers/TerritoryStatus.java | 2 +- .../handlers/usercommandhandlers/Time.java | 4 ++-- .../l2jmobius/gameserver/model/actor/L2Npc.java | 2 +- .../actor/instance/FriendlyNpcInstance.java | 2 +- .../actor/instance/L2FishermanInstance.java | 2 +- .../model/actor/instance/L2GuardInstance.java | 2 +- .../model/actor/instance/L2MerchantInstance.java | 2 +- .../actor/instance/L2PetManagerInstance.java | 2 +- .../actor/instance/L2SchemeBufferInstance.java | 2 +- .../actor/instance/L2VillageMasterInstance.java | 2 +- .../actor/instance/L2WarehouseInstance.java | 2 +- 116 files changed, 252 insertions(+), 252 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java index 8866298e57..235e281ffb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java @@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (!st.hasMoreTokens()) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); @@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce != null) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java index 649b13191c..9d38c5b045 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java @@ -56,7 +56,7 @@ public class TerritoryStatus implements IBypassHandler } } html.replace("%castlename%", npc.getCastle().getName()); - html.replace("%taxpercent%", "" + npc.getCastle().getTaxPercent(TaxType.BUY)); + html.replace("%taxpercent%", Integer.toString(npc.getCastle().getTaxPercent(TaxType.BUY))); html.replace("%objectId%", String.valueOf(npc.getObjectId())); { if (npc.getCastle().getResidenceId() > 6) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 158563f78c..487750ef01 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler } final int t = GameTimeController.getInstance().getGameTime(); - final String h = "" + ((t / 60) % 24); + final String h = Integer.toString(((t / 60) % 24)); String m; if ((t % 60) < 10) { @@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler } else { - m = "" + (t % 60); + m = Integer.toString((t % 60)); } SystemMessage sm; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java index 56b1227752..d77a3087c2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java @@ -316,7 +316,7 @@ public final class Q00386_StolenDignity extends Quest final int i1 = getNumberFromBingoBoard(qs, i0); if (isSelectedBingoNumber(qs, i1)) { - html = html.replace("", i1 + ""); + html = html.replace("", Integer.toString(i1)); } else { @@ -332,7 +332,7 @@ public final class Q00386_StolenDignity extends Quest { final int i1 = getNumberFromBingoBoard(qs, i0); html = html.replace("", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff"); - html = html.replace("", i1 + ""); + html = html.replace("", Integer.toString(i1)); } return html; } @@ -615,7 +615,7 @@ public final class Q00386_StolenDignity extends Quest { if (i == pos) { - selected[i] = num + ""; + selected[i] = Integer.toString(num); continue; } } @@ -634,7 +634,7 @@ public final class Q00386_StolenDignity extends Quest */ private boolean isSelectedBingoNumber(QuestState qs, int num) { - return qs.get("selected").contains(num + ""); + return qs.get("selected").contains(Integer.toString(num)); } /** diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 7cdab9fd02..e91adac0ca 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -318,7 +318,7 @@ public class Q00663_SeductiveWhispers extends Quest isPlayerWin = true; htmltext = getHtm(player, isPractice ? "30846-07.html" : "30846-18.html"); htmltext = htmltext.replace("%table%", table); - htmltext = htmltext.replaceAll("%win_count%", "" + winCount); + htmltext = htmltext.replaceAll("%win_count%", Integer.toString(winCount)); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 5509d63cf4..1a6463c8a4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -683,7 +683,7 @@ public class L2Npc extends L2Character if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java index a7ee798e97..103f399dee 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java @@ -154,7 +154,7 @@ public class FriendlyNpcInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java index c65bc80195..cf2b43ab44 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java @@ -42,7 +42,7 @@ public final class L2FishermanInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 214c883f17..02328dbae9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -106,7 +106,7 @@ public class L2GuardInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 1519fc6308..31bceb4818 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -55,7 +55,7 @@ public class L2MerchantInstance extends L2NpcInstance String pom; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java index 327e33f37f..cc88d1382a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java @@ -36,7 +36,7 @@ public class L2PetManagerInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java index a077f30db6..d2b4afa1ec 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java @@ -413,7 +413,7 @@ public class L2RaceManagerInstance extends L2Npc } else { - html.replace(search, "" + val); + html.replace(search, Integer.toString(val)); player.setRace(0, val); } } @@ -425,7 +425,7 @@ public class L2RaceManagerInstance extends L2Npc } filename = getHtmlPath(npcId, 3); html.setFile(player, filename); - html.replace("0place", "" + player.getRace(0)); + html.replace("0place", Integer.toString(player.getRace(0))); search = "Mob1"; replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName(); html.replace(search, replace); @@ -436,7 +436,7 @@ public class L2RaceManagerInstance extends L2Npc } else { - html.replace(search, "" + _cost[val - 11]); + html.replace(search, Integer.toString(_cost[val - 11])); player.setRace(1, val - 10); } } @@ -448,19 +448,19 @@ public class L2RaceManagerInstance extends L2Npc } filename = getHtmlPath(npcId, 4); html.setFile(player, filename); - html.replace("0place", "" + player.getRace(0)); + html.replace("0place", Integer.toString(player.getRace(0))); search = "Mob1"; replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName(); html.replace(search, replace); search = "0adena"; final int price = _cost[player.getRace(1) - 1]; - html.replace(search, "" + price); + html.replace(search, Integer.toString(price)); search = "0tax"; final int tax = 0; - html.replace(search, "" + tax); + html.replace(search, Integer.toString(tax)); search = "0total"; final int total = price + tax; - html.replace(search, "" + total); + html.replace(search, Integer.toString(total)); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index bfa6d32a82..f8ecc45647 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -81,7 +81,7 @@ public class L2VillageMasterInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java index 56e4ab0602..021e82e251 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java @@ -52,7 +52,7 @@ public class L2WarehouseInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java index 8866298e57..235e281ffb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java @@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (!st.hasMoreTokens()) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); @@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce != null) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java index 649b13191c..9d38c5b045 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java @@ -56,7 +56,7 @@ public class TerritoryStatus implements IBypassHandler } } html.replace("%castlename%", npc.getCastle().getName()); - html.replace("%taxpercent%", "" + npc.getCastle().getTaxPercent(TaxType.BUY)); + html.replace("%taxpercent%", Integer.toString(npc.getCastle().getTaxPercent(TaxType.BUY))); html.replace("%objectId%", String.valueOf(npc.getObjectId())); { if (npc.getCastle().getResidenceId() > 6) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 158563f78c..487750ef01 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler } final int t = GameTimeController.getInstance().getGameTime(); - final String h = "" + ((t / 60) % 24); + final String h = Integer.toString(((t / 60) % 24)); String m; if ((t % 60) < 10) { @@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler } else { - m = "" + (t % 60); + m = Integer.toString((t % 60)); } SystemMessage sm; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java index 56b1227752..d77a3087c2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java @@ -316,7 +316,7 @@ public final class Q00386_StolenDignity extends Quest final int i1 = getNumberFromBingoBoard(qs, i0); if (isSelectedBingoNumber(qs, i1)) { - html = html.replace("", i1 + ""); + html = html.replace("", Integer.toString(i1)); } else { @@ -332,7 +332,7 @@ public final class Q00386_StolenDignity extends Quest { final int i1 = getNumberFromBingoBoard(qs, i0); html = html.replace("", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff"); - html = html.replace("", i1 + ""); + html = html.replace("", Integer.toString(i1)); } return html; } @@ -615,7 +615,7 @@ public final class Q00386_StolenDignity extends Quest { if (i == pos) { - selected[i] = num + ""; + selected[i] = Integer.toString(num); continue; } } @@ -634,7 +634,7 @@ public final class Q00386_StolenDignity extends Quest */ private boolean isSelectedBingoNumber(QuestState qs, int num) { - return qs.get("selected").contains(num + ""); + return qs.get("selected").contains(Integer.toString(num)); } /** diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 7cdab9fd02..e91adac0ca 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -318,7 +318,7 @@ public class Q00663_SeductiveWhispers extends Quest isPlayerWin = true; htmltext = getHtm(player, isPractice ? "30846-07.html" : "30846-18.html"); htmltext = htmltext.replace("%table%", table); - htmltext = htmltext.replaceAll("%win_count%", "" + winCount); + htmltext = htmltext.replaceAll("%win_count%", Integer.toString(winCount)); } else { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java index 3e827c6f0b..d6a3aa2b9c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java @@ -95,7 +95,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest { if ((player.getLevel() >= MIN_LEVEL)) { - if (hasQuestItems(player, DARK_SOUL_STONE) && qs.get("" + ISTINA).equals("true") && qs.get("" + OCTAVIS).equals("true") && qs.get("" + TAUTI).equals("true") && qs.get("" + EKIMUS).equals("true")) + if (hasQuestItems(player, DARK_SOUL_STONE) && qs.get(Integer.toString(ISTINA)).equals("true") && qs.get(Integer.toString(OCTAVIS)).equals("true") && qs.get(Integer.toString(TAUTI)).equals("true") && qs.get(Integer.toString(EKIMUS)).equals("true")) { if (hasQuestItems(player, OLYMPIAD_MANAGER_CERTIFICATE, ISHUMA_CERTIFICATE, SIR_KRISTOF_RODEMAI_CERTIFICATE)) { @@ -108,10 +108,10 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest takeItems(player, DARK_SOUL_STONE, -1); giveItems(player, DAICHIR_SERTIFICATE, 1); addExpAndSp(player, EXP_AMOUNT, 0); - qs.unset("" + ISTINA); - qs.unset("" + OCTAVIS); - qs.unset("" + TAUTI); - qs.unset("" + EKIMUS); + qs.unset(Integer.toString(ISTINA)); + qs.unset(Integer.toString(OCTAVIS)); + qs.unset(Integer.toString(TAUTI)); + qs.unset(Integer.toString(EKIMUS)); qs.exitQuest(false, true); } } @@ -140,7 +140,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest } case State.STARTED: { - if (hasQuestItems(player, DARK_SOUL_STONE) && qs.get("" + ISTINA).equals("true") && qs.get("" + OCTAVIS).equals("true") && qs.get("" + TAUTI).equals("true") && qs.get("" + EKIMUS).equals("true")) + if (hasQuestItems(player, DARK_SOUL_STONE) && qs.get(Integer.toString(ISTINA)).equals("true") && qs.get(Integer.toString(OCTAVIS)).equals("true") && qs.get(Integer.toString(TAUTI)).equals("true") && qs.get(Integer.toString(EKIMUS)).equals("true")) { htmltext = "30537-08.html"; } @@ -179,7 +179,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest } else { - qs.set("" + npc.getId(), "true"); + qs.set(Integer.toString(npc.getId()), "true"); } } } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index df2e4506df..1dd9866569 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -683,7 +683,7 @@ public class L2Npc extends L2Character if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java index a7ee798e97..103f399dee 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java @@ -154,7 +154,7 @@ public class FriendlyNpcInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java index c65bc80195..cf2b43ab44 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java @@ -42,7 +42,7 @@ public final class L2FishermanInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 214c883f17..02328dbae9 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -106,7 +106,7 @@ public class L2GuardInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 1519fc6308..31bceb4818 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -55,7 +55,7 @@ public class L2MerchantInstance extends L2NpcInstance String pom; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java index 327e33f37f..cc88d1382a 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java @@ -36,7 +36,7 @@ public class L2PetManagerInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java index a077f30db6..d2b4afa1ec 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java @@ -413,7 +413,7 @@ public class L2RaceManagerInstance extends L2Npc } else { - html.replace(search, "" + val); + html.replace(search, Integer.toString(val)); player.setRace(0, val); } } @@ -425,7 +425,7 @@ public class L2RaceManagerInstance extends L2Npc } filename = getHtmlPath(npcId, 3); html.setFile(player, filename); - html.replace("0place", "" + player.getRace(0)); + html.replace("0place", Integer.toString(player.getRace(0))); search = "Mob1"; replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName(); html.replace(search, replace); @@ -436,7 +436,7 @@ public class L2RaceManagerInstance extends L2Npc } else { - html.replace(search, "" + _cost[val - 11]); + html.replace(search, Integer.toString(_cost[val - 11])); player.setRace(1, val - 10); } } @@ -448,19 +448,19 @@ public class L2RaceManagerInstance extends L2Npc } filename = getHtmlPath(npcId, 4); html.setFile(player, filename); - html.replace("0place", "" + player.getRace(0)); + html.replace("0place", Integer.toString(player.getRace(0))); search = "Mob1"; replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName(); html.replace(search, replace); search = "0adena"; final int price = _cost[player.getRace(1) - 1]; - html.replace(search, "" + price); + html.replace(search, Integer.toString(price)); search = "0tax"; final int tax = 0; - html.replace(search, "" + tax); + html.replace(search, Integer.toString(tax)); search = "0total"; final int total = price + tax; - html.replace(search, "" + total); + html.replace(search, Integer.toString(total)); } else { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index bfa6d32a82..f8ecc45647 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -81,7 +81,7 @@ public class L2VillageMasterInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java index 56e4ab0602..021e82e251 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java @@ -52,7 +52,7 @@ public class L2WarehouseInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java index 8866298e57..235e281ffb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java @@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (!st.hasMoreTokens()) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); @@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce != null) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java index 649b13191c..9d38c5b045 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java @@ -56,7 +56,7 @@ public class TerritoryStatus implements IBypassHandler } } html.replace("%castlename%", npc.getCastle().getName()); - html.replace("%taxpercent%", "" + npc.getCastle().getTaxPercent(TaxType.BUY)); + html.replace("%taxpercent%", Integer.toString(npc.getCastle().getTaxPercent(TaxType.BUY))); html.replace("%objectId%", String.valueOf(npc.getObjectId())); { if (npc.getCastle().getResidenceId() > 6) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 158563f78c..487750ef01 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler } final int t = GameTimeController.getInstance().getGameTime(); - final String h = "" + ((t / 60) % 24); + final String h = Integer.toString(((t / 60) % 24)); String m; if ((t % 60) < 10) { @@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler } else { - m = "" + (t % 60); + m = Integer.toString((t % 60)); } SystemMessage sm; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java index 1cf3dd274a..5653976766 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java @@ -316,7 +316,7 @@ public final class Q00386_StolenDignity extends Quest final int i1 = getNumberFromBingoBoard(qs, i0); if (isSelectedBingoNumber(qs, i1)) { - html = html.replace("", i1 + ""); + html = html.replace("", Integer.toString(i1)); } else { @@ -332,7 +332,7 @@ public final class Q00386_StolenDignity extends Quest { final int i1 = getNumberFromBingoBoard(qs, i0); html = html.replace("", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff"); - html = html.replace("", i1 + ""); + html = html.replace("", Integer.toString(i1)); } return html; } @@ -615,7 +615,7 @@ public final class Q00386_StolenDignity extends Quest { if (i == pos) { - selected[i] = num + ""; + selected[i] = Integer.toString(num); continue; } } @@ -634,7 +634,7 @@ public final class Q00386_StolenDignity extends Quest */ private boolean isSelectedBingoNumber(QuestState qs, int num) { - return qs.get("selected").contains(num + ""); + return qs.get("selected").contains(Integer.toString(num)); } /** diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 7cdab9fd02..e91adac0ca 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -318,7 +318,7 @@ public class Q00663_SeductiveWhispers extends Quest isPlayerWin = true; htmltext = getHtm(player, isPractice ? "30846-07.html" : "30846-18.html"); htmltext = htmltext.replace("%table%", table); - htmltext = htmltext.replaceAll("%win_count%", "" + winCount); + htmltext = htmltext.replaceAll("%win_count%", Integer.toString(winCount)); } else { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java index 3e827c6f0b..d6a3aa2b9c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java @@ -95,7 +95,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest { if ((player.getLevel() >= MIN_LEVEL)) { - if (hasQuestItems(player, DARK_SOUL_STONE) && qs.get("" + ISTINA).equals("true") && qs.get("" + OCTAVIS).equals("true") && qs.get("" + TAUTI).equals("true") && qs.get("" + EKIMUS).equals("true")) + if (hasQuestItems(player, DARK_SOUL_STONE) && qs.get(Integer.toString(ISTINA)).equals("true") && qs.get(Integer.toString(OCTAVIS)).equals("true") && qs.get(Integer.toString(TAUTI)).equals("true") && qs.get(Integer.toString(EKIMUS)).equals("true")) { if (hasQuestItems(player, OLYMPIAD_MANAGER_CERTIFICATE, ISHUMA_CERTIFICATE, SIR_KRISTOF_RODEMAI_CERTIFICATE)) { @@ -108,10 +108,10 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest takeItems(player, DARK_SOUL_STONE, -1); giveItems(player, DAICHIR_SERTIFICATE, 1); addExpAndSp(player, EXP_AMOUNT, 0); - qs.unset("" + ISTINA); - qs.unset("" + OCTAVIS); - qs.unset("" + TAUTI); - qs.unset("" + EKIMUS); + qs.unset(Integer.toString(ISTINA)); + qs.unset(Integer.toString(OCTAVIS)); + qs.unset(Integer.toString(TAUTI)); + qs.unset(Integer.toString(EKIMUS)); qs.exitQuest(false, true); } } @@ -140,7 +140,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest } case State.STARTED: { - if (hasQuestItems(player, DARK_SOUL_STONE) && qs.get("" + ISTINA).equals("true") && qs.get("" + OCTAVIS).equals("true") && qs.get("" + TAUTI).equals("true") && qs.get("" + EKIMUS).equals("true")) + if (hasQuestItems(player, DARK_SOUL_STONE) && qs.get(Integer.toString(ISTINA)).equals("true") && qs.get(Integer.toString(OCTAVIS)).equals("true") && qs.get(Integer.toString(TAUTI)).equals("true") && qs.get(Integer.toString(EKIMUS)).equals("true")) { htmltext = "30537-08.html"; } @@ -179,7 +179,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest } else { - qs.set("" + npc.getId(), "true"); + qs.set(Integer.toString(npc.getId()), "true"); } } } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index df2e4506df..1dd9866569 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -683,7 +683,7 @@ public class L2Npc extends L2Character if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java index a7ee798e97..103f399dee 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java @@ -154,7 +154,7 @@ public class FriendlyNpcInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java index c65bc80195..cf2b43ab44 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java @@ -42,7 +42,7 @@ public final class L2FishermanInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 214c883f17..02328dbae9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -106,7 +106,7 @@ public class L2GuardInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 1519fc6308..31bceb4818 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -55,7 +55,7 @@ public class L2MerchantInstance extends L2NpcInstance String pom; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java index 327e33f37f..cc88d1382a 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java @@ -36,7 +36,7 @@ public class L2PetManagerInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java index a077f30db6..d2b4afa1ec 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java @@ -413,7 +413,7 @@ public class L2RaceManagerInstance extends L2Npc } else { - html.replace(search, "" + val); + html.replace(search, Integer.toString(val)); player.setRace(0, val); } } @@ -425,7 +425,7 @@ public class L2RaceManagerInstance extends L2Npc } filename = getHtmlPath(npcId, 3); html.setFile(player, filename); - html.replace("0place", "" + player.getRace(0)); + html.replace("0place", Integer.toString(player.getRace(0))); search = "Mob1"; replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName(); html.replace(search, replace); @@ -436,7 +436,7 @@ public class L2RaceManagerInstance extends L2Npc } else { - html.replace(search, "" + _cost[val - 11]); + html.replace(search, Integer.toString(_cost[val - 11])); player.setRace(1, val - 10); } } @@ -448,19 +448,19 @@ public class L2RaceManagerInstance extends L2Npc } filename = getHtmlPath(npcId, 4); html.setFile(player, filename); - html.replace("0place", "" + player.getRace(0)); + html.replace("0place", Integer.toString(player.getRace(0))); search = "Mob1"; replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName(); html.replace(search, replace); search = "0adena"; final int price = _cost[player.getRace(1) - 1]; - html.replace(search, "" + price); + html.replace(search, Integer.toString(price)); search = "0tax"; final int tax = 0; - html.replace(search, "" + tax); + html.replace(search, Integer.toString(tax)); search = "0total"; final int total = price + tax; - html.replace(search, "" + total); + html.replace(search, Integer.toString(total)); } else { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index bfa6d32a82..f8ecc45647 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -81,7 +81,7 @@ public class L2VillageMasterInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java index 56e4ab0602..021e82e251 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java @@ -52,7 +52,7 @@ public class L2WarehouseInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java index 8866298e57..235e281ffb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java @@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (!st.hasMoreTokens()) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); @@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce != null) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java index 649b13191c..9d38c5b045 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java @@ -56,7 +56,7 @@ public class TerritoryStatus implements IBypassHandler } } html.replace("%castlename%", npc.getCastle().getName()); - html.replace("%taxpercent%", "" + npc.getCastle().getTaxPercent(TaxType.BUY)); + html.replace("%taxpercent%", Integer.toString(npc.getCastle().getTaxPercent(TaxType.BUY))); html.replace("%objectId%", String.valueOf(npc.getObjectId())); { if (npc.getCastle().getResidenceId() > 6) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 158563f78c..487750ef01 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler } final int t = GameTimeController.getInstance().getGameTime(); - final String h = "" + ((t / 60) % 24); + final String h = Integer.toString(((t / 60) % 24)); String m; if ((t % 60) < 10) { @@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler } else { - m = "" + (t % 60); + m = Integer.toString((t % 60)); } SystemMessage sm; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java index 1cf3dd274a..5653976766 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java @@ -316,7 +316,7 @@ public final class Q00386_StolenDignity extends Quest final int i1 = getNumberFromBingoBoard(qs, i0); if (isSelectedBingoNumber(qs, i1)) { - html = html.replace("", i1 + ""); + html = html.replace("", Integer.toString(i1)); } else { @@ -332,7 +332,7 @@ public final class Q00386_StolenDignity extends Quest { final int i1 = getNumberFromBingoBoard(qs, i0); html = html.replace("", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff"); - html = html.replace("", i1 + ""); + html = html.replace("", Integer.toString(i1)); } return html; } @@ -615,7 +615,7 @@ public final class Q00386_StolenDignity extends Quest { if (i == pos) { - selected[i] = num + ""; + selected[i] = Integer.toString(num); continue; } } @@ -634,7 +634,7 @@ public final class Q00386_StolenDignity extends Quest */ private boolean isSelectedBingoNumber(QuestState qs, int num) { - return qs.get("selected").contains(num + ""); + return qs.get("selected").contains(Integer.toString(num)); } /** diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 7cdab9fd02..e91adac0ca 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -318,7 +318,7 @@ public class Q00663_SeductiveWhispers extends Quest isPlayerWin = true; htmltext = getHtm(player, isPractice ? "30846-07.html" : "30846-18.html"); htmltext = htmltext.replace("%table%", table); - htmltext = htmltext.replaceAll("%win_count%", "" + winCount); + htmltext = htmltext.replaceAll("%win_count%", Integer.toString(winCount)); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java index 3e827c6f0b..d6a3aa2b9c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10818_ConfrontingAGiantMonster/Q10818_ConfrontingAGiantMonster.java @@ -95,7 +95,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest { if ((player.getLevel() >= MIN_LEVEL)) { - if (hasQuestItems(player, DARK_SOUL_STONE) && qs.get("" + ISTINA).equals("true") && qs.get("" + OCTAVIS).equals("true") && qs.get("" + TAUTI).equals("true") && qs.get("" + EKIMUS).equals("true")) + if (hasQuestItems(player, DARK_SOUL_STONE) && qs.get(Integer.toString(ISTINA)).equals("true") && qs.get(Integer.toString(OCTAVIS)).equals("true") && qs.get(Integer.toString(TAUTI)).equals("true") && qs.get(Integer.toString(EKIMUS)).equals("true")) { if (hasQuestItems(player, OLYMPIAD_MANAGER_CERTIFICATE, ISHUMA_CERTIFICATE, SIR_KRISTOF_RODEMAI_CERTIFICATE)) { @@ -108,10 +108,10 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest takeItems(player, DARK_SOUL_STONE, -1); giveItems(player, DAICHIR_SERTIFICATE, 1); addExpAndSp(player, EXP_AMOUNT, 0); - qs.unset("" + ISTINA); - qs.unset("" + OCTAVIS); - qs.unset("" + TAUTI); - qs.unset("" + EKIMUS); + qs.unset(Integer.toString(ISTINA)); + qs.unset(Integer.toString(OCTAVIS)); + qs.unset(Integer.toString(TAUTI)); + qs.unset(Integer.toString(EKIMUS)); qs.exitQuest(false, true); } } @@ -140,7 +140,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest } case State.STARTED: { - if (hasQuestItems(player, DARK_SOUL_STONE) && qs.get("" + ISTINA).equals("true") && qs.get("" + OCTAVIS).equals("true") && qs.get("" + TAUTI).equals("true") && qs.get("" + EKIMUS).equals("true")) + if (hasQuestItems(player, DARK_SOUL_STONE) && qs.get(Integer.toString(ISTINA)).equals("true") && qs.get(Integer.toString(OCTAVIS)).equals("true") && qs.get(Integer.toString(TAUTI)).equals("true") && qs.get(Integer.toString(EKIMUS)).equals("true")) { htmltext = "30537-08.html"; } @@ -179,7 +179,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest } else { - qs.set("" + npc.getId(), "true"); + qs.set(Integer.toString(npc.getId()), "true"); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index df2e4506df..1dd9866569 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -683,7 +683,7 @@ public class L2Npc extends L2Character if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java index a7ee798e97..103f399dee 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java @@ -154,7 +154,7 @@ public class FriendlyNpcInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java index c65bc80195..cf2b43ab44 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java @@ -42,7 +42,7 @@ public final class L2FishermanInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 214c883f17..02328dbae9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -106,7 +106,7 @@ public class L2GuardInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 1519fc6308..31bceb4818 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -55,7 +55,7 @@ public class L2MerchantInstance extends L2NpcInstance String pom; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java index 327e33f37f..cc88d1382a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java @@ -36,7 +36,7 @@ public class L2PetManagerInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java index a077f30db6..d2b4afa1ec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java @@ -413,7 +413,7 @@ public class L2RaceManagerInstance extends L2Npc } else { - html.replace(search, "" + val); + html.replace(search, Integer.toString(val)); player.setRace(0, val); } } @@ -425,7 +425,7 @@ public class L2RaceManagerInstance extends L2Npc } filename = getHtmlPath(npcId, 3); html.setFile(player, filename); - html.replace("0place", "" + player.getRace(0)); + html.replace("0place", Integer.toString(player.getRace(0))); search = "Mob1"; replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName(); html.replace(search, replace); @@ -436,7 +436,7 @@ public class L2RaceManagerInstance extends L2Npc } else { - html.replace(search, "" + _cost[val - 11]); + html.replace(search, Integer.toString(_cost[val - 11])); player.setRace(1, val - 10); } } @@ -448,19 +448,19 @@ public class L2RaceManagerInstance extends L2Npc } filename = getHtmlPath(npcId, 4); html.setFile(player, filename); - html.replace("0place", "" + player.getRace(0)); + html.replace("0place", Integer.toString(player.getRace(0))); search = "Mob1"; replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName(); html.replace(search, replace); search = "0adena"; final int price = _cost[player.getRace(1) - 1]; - html.replace(search, "" + price); + html.replace(search, Integer.toString(price)); search = "0tax"; final int tax = 0; - html.replace(search, "" + tax); + html.replace(search, Integer.toString(tax)); search = "0total"; final int total = price + tax; - html.replace(search, "" + total); + html.replace(search, Integer.toString(total)); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index bfa6d32a82..f8ecc45647 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -81,7 +81,7 @@ public class L2VillageMasterInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java index 56e4ab0602..021e82e251 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java @@ -52,7 +52,7 @@ public class L2WarehouseInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java index 1f6451f37e..ef1563fc8c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java @@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (!st.hasMoreTokens()) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); @@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce != null) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java index 8f5bcc906b..33161a0e06 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Loto.java @@ -334,13 +334,13 @@ public class Loto implements IBypassHandler return; } html.replace("%objectId%", String.valueOf(npc.getObjectId())); - html.replace("%race%", "" + Lottery.getInstance().getId()); - html.replace("%adena%", "" + Lottery.getInstance().getPrize()); - html.replace("%ticket_price%", "" + Config.ALT_LOTTERY_TICKET_PRICE); - html.replace("%prize5%", "" + (Config.ALT_LOTTERY_5_NUMBER_RATE * 100)); - html.replace("%prize4%", "" + (Config.ALT_LOTTERY_4_NUMBER_RATE * 100)); - html.replace("%prize3%", "" + (Config.ALT_LOTTERY_3_NUMBER_RATE * 100)); - html.replace("%prize2%", "" + Config.ALT_LOTTERY_2_AND_1_NUMBER_PRIZE); + html.replace("%race%", Integer.toString(Lottery.getInstance().getId())); + html.replace("%adena%", Long.toString(Lottery.getInstance().getPrize())); + html.replace("%ticket_price%", Long.toString(Config.ALT_LOTTERY_TICKET_PRICE)); + html.replace("%prize5%", Float.toString(Config.ALT_LOTTERY_5_NUMBER_RATE * 100)); + html.replace("%prize4%", Float.toString(Config.ALT_LOTTERY_4_NUMBER_RATE * 100)); + html.replace("%prize3%", Float.toString(Config.ALT_LOTTERY_3_NUMBER_RATE * 100)); + html.replace("%prize2%", Long.toString(Config.ALT_LOTTERY_2_AND_1_NUMBER_PRIZE)); html.replace("%enddate%", "" + DateFormat.getDateInstance().format(Lottery.getInstance().getEndDate())); player.sendPacket(html); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java index 0f7e83ee05..188a80b7a0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java @@ -55,7 +55,7 @@ public class TerritoryStatus implements IBypassHandler } } html.replace("%castlename%", npc.getCastle().getName()); - html.replace("%taxpercent%", "" + npc.getCastle().getTaxPercent()); + html.replace("%taxpercent%", Integer.toString(npc.getCastle().getTaxPercent())); html.replace("%objectId%", String.valueOf(npc.getObjectId())); { if (npc.getCastle().getResidenceId() > 6) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 8ce7fa585b..a98dbb5e34 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler } final int t = GameTimeController.getInstance().getGameTime(); - final String h = "" + ((t / 60) % 24); + final String h = Integer.toString(((t / 60) % 24)); String m; if ((t % 60) < 10) { @@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler } else { - m = "" + (t % 60); + m = Integer.toString((t % 60)); } SystemMessage sm; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java index 7028372d35..9e8050917c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java @@ -362,7 +362,7 @@ public final class Q00384_WarehouseKeepersPastime extends Quest int i1 = getNumberFromBingoBoard(qs, i0); if (isSelectedBingoNumber(qs, i1)) { - html = html.replace("", i1 + ""); + html = html.replace("", Integer.toString(i1)); } else { @@ -378,7 +378,7 @@ public final class Q00384_WarehouseKeepersPastime extends Quest { int i1 = getNumberFromBingoBoard(qs, i0); html = html.replace("", (isSelectedBingoNumber(qs, i1)) ? "ff0000" : "ffffff"); - html = html.replace("", i1 + ""); + html = html.replace("", Integer.toString(i1)); } return html; } @@ -596,7 +596,7 @@ public final class Q00384_WarehouseKeepersPastime extends Quest { if (i == pos) { - selected[i] = num + ""; + selected[i] = Integer.toString(num); continue; } } @@ -615,7 +615,7 @@ public final class Q00384_WarehouseKeepersPastime extends Quest */ private boolean isSelectedBingoNumber(QuestState qs, int num) { - return qs.get("selected").contains(num + ""); + return qs.get("selected").contains(Integer.toString(num)); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java index 2b779bcd7e..2905c06a31 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java @@ -325,7 +325,7 @@ public final class Q00386_StolenDignity extends Quest final int i1 = getNumberFromBingoBoard(qs, i0); if (isSelectedBingoNumber(qs, i1)) { - html = html.replace("", i1 + ""); + html = html.replace("", Integer.toString(i1)); } else { @@ -341,7 +341,7 @@ public final class Q00386_StolenDignity extends Quest { final int i1 = getNumberFromBingoBoard(qs, i0); html = html.replace("", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff"); - html = html.replace("", i1 + ""); + html = html.replace("", Integer.toString(i1)); } return html; } @@ -624,7 +624,7 @@ public final class Q00386_StolenDignity extends Quest { if (i == pos) { - selected[i] = num + ""; + selected[i] = Integer.toString(num); continue; } } @@ -643,7 +643,7 @@ public final class Q00386_StolenDignity extends Quest */ private boolean isSelectedBingoNumber(QuestState qs, int num) { - return qs.get("selected").contains(num + ""); + return qs.get("selected").contains(Integer.toString(num)); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 26d078a8ee..1f9e81e10d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -831,7 +831,7 @@ public class L2Npc extends L2Character if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AdventurerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AdventurerInstance.java index 8843c629dd..82fec5b9cf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AdventurerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AdventurerInstance.java @@ -39,7 +39,7 @@ public class L2AdventurerInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java index fac089a4f2..08287ffdb6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java @@ -55,7 +55,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DungeonGatekeeperInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DungeonGatekeeperInstance.java index 356ef3c5a2..e65e200e9f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DungeonGatekeeperInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2DungeonGatekeeperInstance.java @@ -186,7 +186,7 @@ public class L2DungeonGatekeeperInstance extends L2Npc String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java index bb93574009..ad05600637 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java @@ -52,7 +52,7 @@ public final class L2FishermanInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index b94a1eabe8..a7a53e9d9b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -101,7 +101,7 @@ public class L2GuardInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 5621e4f650..0e4005ffbc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -58,7 +58,7 @@ public class L2MerchantInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java index e8a80b3447..f3e6114a6b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java @@ -41,7 +41,7 @@ public class L2PetManagerInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java index f5f8ae1c89..b539779d78 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2RaceManagerInstance.java @@ -370,7 +370,7 @@ public class L2RaceManagerInstance extends L2Npc } else { - html.replace(search, "" + val); + html.replace(search, Integer.toString(val)); player.setRace(0, val); } } @@ -382,7 +382,7 @@ public class L2RaceManagerInstance extends L2Npc } filename = getHtmlPath(npcId, 3); html.setFile(player, filename); - html.replace("0place", "" + player.getRace(0)); + html.replace("0place", Integer.toString(player.getRace(0))); search = "Mob1"; replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName(); html.replace(search, replace); @@ -393,7 +393,7 @@ public class L2RaceManagerInstance extends L2Npc } else { - html.replace(search, "" + _cost[val - 11]); + html.replace(search, Integer.toString(_cost[val - 11])); player.setRace(1, val - 10); } } @@ -405,19 +405,19 @@ public class L2RaceManagerInstance extends L2Npc } filename = getHtmlPath(npcId, 4); html.setFile(player, filename); - html.replace("0place", "" + player.getRace(0)); + html.replace("0place", Integer.toString(player.getRace(0))); search = "Mob1"; replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName(); html.replace(search, replace); search = "0adena"; final int price = _cost[player.getRace(1) - 1]; - html.replace(search, "" + price); + html.replace(search, Integer.toString(price)); search = "0tax"; final int tax = 0; - html.replace(search, "" + tax); + html.replace(search, Integer.toString(tax)); search = "0total"; final int total = price + tax; - html.replace(search, "" + total); + html.replace(search, Integer.toString(total)); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java index 74502cf462..18fba6cc96 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java @@ -229,7 +229,7 @@ public class L2SchemeBufferInstance extends L2Npc String filename = ""; if (val == 0) { - filename = "" + npcId; + filename = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java index 5aec534905..bd5dbdf8a5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2SepulcherNpcInstance.java @@ -258,7 +258,7 @@ public class L2SepulcherNpcInstance extends L2Npc String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java index 0b13f11b59..78d6024a9a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java @@ -163,7 +163,7 @@ public final class L2TeleporterInstance extends L2Npc String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TrainerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TrainerInstance.java index 23060842af..9e38aafaf0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TrainerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2TrainerInstance.java @@ -37,7 +37,7 @@ public class L2TrainerInstance extends L2NpcInstance String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index 342a5fe309..3ecc5b46a8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -82,7 +82,7 @@ public class L2VillageMasterInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java index df207484e7..691c81e3d6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java @@ -44,7 +44,7 @@ public class L2WarehouseInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java index 8866298e57..235e281ffb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java @@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (!st.hasMoreTokens()) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); @@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce != null) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java index 649b13191c..9d38c5b045 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java @@ -56,7 +56,7 @@ public class TerritoryStatus implements IBypassHandler } } html.replace("%castlename%", npc.getCastle().getName()); - html.replace("%taxpercent%", "" + npc.getCastle().getTaxPercent(TaxType.BUY)); + html.replace("%taxpercent%", Integer.toString(npc.getCastle().getTaxPercent(TaxType.BUY))); html.replace("%objectId%", String.valueOf(npc.getObjectId())); { if (npc.getCastle().getResidenceId() > 6) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 158563f78c..487750ef01 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler } final int t = GameTimeController.getInstance().getGameTime(); - final String h = "" + ((t / 60) % 24); + final String h = Integer.toString(((t / 60) % 24)); String m; if ((t % 60) < 10) { @@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler } else { - m = "" + (t % 60); + m = Integer.toString((t % 60)); } SystemMessage sm; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 43cba39de1..07f32d54a9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -683,7 +683,7 @@ public class L2Npc extends L2Character if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java index a7ee798e97..103f399dee 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java @@ -154,7 +154,7 @@ public class FriendlyNpcInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java index c65bc80195..cf2b43ab44 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java @@ -42,7 +42,7 @@ public final class L2FishermanInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 214c883f17..02328dbae9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -106,7 +106,7 @@ public class L2GuardInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 1519fc6308..31bceb4818 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -55,7 +55,7 @@ public class L2MerchantInstance extends L2NpcInstance String pom; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java index 327e33f37f..cc88d1382a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java @@ -36,7 +36,7 @@ public class L2PetManagerInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java index f3951ed5e8..882a43303f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java @@ -229,7 +229,7 @@ public class L2SchemeBufferInstance extends L2Npc String filename = ""; if (val == 0) { - filename = "" + npcId; + filename = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index d85aa886ef..5b01cfd971 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -93,7 +93,7 @@ public class L2VillageMasterInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java index 56e4ab0602..021e82e251 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java @@ -52,7 +52,7 @@ public class L2WarehouseInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java index 8866298e57..235e281ffb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java @@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (!st.hasMoreTokens()) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); @@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce != null) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java index 649b13191c..9d38c5b045 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java @@ -56,7 +56,7 @@ public class TerritoryStatus implements IBypassHandler } } html.replace("%castlename%", npc.getCastle().getName()); - html.replace("%taxpercent%", "" + npc.getCastle().getTaxPercent(TaxType.BUY)); + html.replace("%taxpercent%", Integer.toString(npc.getCastle().getTaxPercent(TaxType.BUY))); html.replace("%objectId%", String.valueOf(npc.getObjectId())); { if (npc.getCastle().getResidenceId() > 6) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 158563f78c..487750ef01 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler } final int t = GameTimeController.getInstance().getGameTime(); - final String h = "" + ((t / 60) % 24); + final String h = Integer.toString(((t / 60) % 24)); String m; if ((t % 60) < 10) { @@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler } else { - m = "" + (t % 60); + m = Integer.toString((t % 60)); } SystemMessage sm; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 43cba39de1..07f32d54a9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -683,7 +683,7 @@ public class L2Npc extends L2Character if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java index a7ee798e97..103f399dee 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java @@ -154,7 +154,7 @@ public class FriendlyNpcInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java index c65bc80195..cf2b43ab44 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java @@ -42,7 +42,7 @@ public final class L2FishermanInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 214c883f17..02328dbae9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -106,7 +106,7 @@ public class L2GuardInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 1519fc6308..31bceb4818 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -55,7 +55,7 @@ public class L2MerchantInstance extends L2NpcInstance String pom; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java index 327e33f37f..cc88d1382a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java @@ -36,7 +36,7 @@ public class L2PetManagerInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java index f3951ed5e8..882a43303f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java @@ -229,7 +229,7 @@ public class L2SchemeBufferInstance extends L2Npc String filename = ""; if (val == 0) { - filename = "" + npcId; + filename = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index d85aa886ef..5b01cfd971 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -93,7 +93,7 @@ public class L2VillageMasterInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java index 56e4ab0602..021e82e251 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java @@ -52,7 +52,7 @@ public class L2WarehouseInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java index 8866298e57..235e281ffb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java @@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (!st.hasMoreTokens()) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); @@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce != null) { String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm"); - final String announcementId = "" + announce.getId(); + final String announcementId = Integer.toString(announce.getId()); final String announcementType = announce.getType().name(); String announcementInital = "0"; String announcementDelay = "0"; @@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler if (announce instanceof AutoAnnouncement) { final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce; - announcementInital = "" + (autoAnnounce.getInitial() / 1000); - announcementDelay = "" + (autoAnnounce.getDelay() / 1000); - announcementRepeat = "" + autoAnnounce.getRepeat(); + announcementInital = Long.toString(autoAnnounce.getInitial() / 1000); + announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000); + announcementRepeat = Integer.toString(autoAnnounce.getRepeat()); } content = content.replaceAll("%id%", announcementId); content = content.replaceAll("%type%", announcementType); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java index 649b13191c..9d38c5b045 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java @@ -56,7 +56,7 @@ public class TerritoryStatus implements IBypassHandler } } html.replace("%castlename%", npc.getCastle().getName()); - html.replace("%taxpercent%", "" + npc.getCastle().getTaxPercent(TaxType.BUY)); + html.replace("%taxpercent%", Integer.toString(npc.getCastle().getTaxPercent(TaxType.BUY))); html.replace("%objectId%", String.valueOf(npc.getObjectId())); { if (npc.getCastle().getResidenceId() > 6) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/Time.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/Time.java index 158563f78c..487750ef01 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/Time.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/usercommandhandlers/Time.java @@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler } final int t = GameTimeController.getInstance().getGameTime(); - final String h = "" + ((t / 60) % 24); + final String h = Integer.toString(((t / 60) % 24)); String m; if ((t % 60) < 10) { @@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler } else { - m = "" + (t % 60); + m = Integer.toString((t % 60)); } SystemMessage sm; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Npc.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Npc.java index 43cba39de1..07f32d54a9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Npc.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Npc.java @@ -683,7 +683,7 @@ public class L2Npc extends L2Character if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java index a7ee798e97..103f399dee 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/FriendlyNpcInstance.java @@ -154,7 +154,7 @@ public class FriendlyNpcInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java index c65bc80195..cf2b43ab44 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2FishermanInstance.java @@ -42,7 +42,7 @@ public final class L2FishermanInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java index 214c883f17..02328dbae9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2GuardInstance.java @@ -106,7 +106,7 @@ public class L2GuardInstance extends L2Attackable String pom = ""; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java index 1519fc6308..31bceb4818 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2MerchantInstance.java @@ -55,7 +55,7 @@ public class L2MerchantInstance extends L2NpcInstance String pom; if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java index 327e33f37f..cc88d1382a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2PetManagerInstance.java @@ -36,7 +36,7 @@ public class L2PetManagerInstance extends L2MerchantInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java index f3951ed5e8..882a43303f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2SchemeBufferInstance.java @@ -229,7 +229,7 @@ public class L2SchemeBufferInstance extends L2Npc String filename = ""; if (val == 0) { - filename = "" + npcId; + filename = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java index d85aa886ef..5b01cfd971 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java @@ -93,7 +93,7 @@ public class L2VillageMasterInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java index 56e4ab0602..021e82e251 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2WarehouseInstance.java @@ -52,7 +52,7 @@ public class L2WarehouseInstance extends L2NpcInstance if (val == 0) { - pom = "" + npcId; + pom = Integer.toString(npcId); } else {