Removed boxing for String conversions.
This commit is contained in:
@@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (!st.hasMoreTokens())
|
if (!st.hasMoreTokens())
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
@@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce != null)
|
if (announce != null)
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ public class TerritoryStatus implements IBypassHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
html.replace("%castlename%", npc.getCastle().getName());
|
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()));
|
html.replace("%objectId%", String.valueOf(npc.getObjectId()));
|
||||||
{
|
{
|
||||||
if (npc.getCastle().getResidenceId() > 6)
|
if (npc.getCastle().getResidenceId() > 6)
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final int t = GameTimeController.getInstance().getGameTime();
|
final int t = GameTimeController.getInstance().getGameTime();
|
||||||
final String h = "" + ((t / 60) % 24);
|
final String h = Integer.toString(((t / 60) % 24));
|
||||||
String m;
|
String m;
|
||||||
if ((t % 60) < 10)
|
if ((t % 60) < 10)
|
||||||
{
|
{
|
||||||
@@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m = "" + (t % 60);
|
m = Integer.toString((t % 60));
|
||||||
}
|
}
|
||||||
|
|
||||||
SystemMessage sm;
|
SystemMessage sm;
|
||||||
|
|||||||
@@ -316,7 +316,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
final int i1 = getNumberFromBingoBoard(qs, i0);
|
final int i1 = getNumberFromBingoBoard(qs, i0);
|
||||||
if (isSelectedBingoNumber(qs, i1))
|
if (isSelectedBingoNumber(qs, i1))
|
||||||
{
|
{
|
||||||
html = html.replace("<?Cell" + (i0 + 1) + "?>", i1 + "");
|
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -332,7 +332,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
{
|
{
|
||||||
final int i1 = getNumberFromBingoBoard(qs, i0);
|
final int i1 = getNumberFromBingoBoard(qs, i0);
|
||||||
html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
|
html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
|
||||||
html = html.replace("<?Cell" + (i0 + 1) + "?>", i1 + "");
|
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
|
||||||
}
|
}
|
||||||
return html;
|
return html;
|
||||||
}
|
}
|
||||||
@@ -615,7 +615,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
{
|
{
|
||||||
if (i == pos)
|
if (i == pos)
|
||||||
{
|
{
|
||||||
selected[i] = num + "";
|
selected[i] = Integer.toString(num);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -634,7 +634,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
*/
|
*/
|
||||||
private boolean isSelectedBingoNumber(QuestState qs, int num)
|
private boolean isSelectedBingoNumber(QuestState qs, int num)
|
||||||
{
|
{
|
||||||
return qs.get("selected").contains(num + "");
|
return qs.get("selected").contains(Integer.toString(num));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -318,7 +318,7 @@ public class Q00663_SeductiveWhispers extends Quest
|
|||||||
isPlayerWin = true;
|
isPlayerWin = true;
|
||||||
htmltext = getHtm(player, isPractice ? "30846-07.html" : "30846-18.html");
|
htmltext = getHtm(player, isPractice ? "30846-07.html" : "30846-18.html");
|
||||||
htmltext = htmltext.replace("%table%", table);
|
htmltext = htmltext.replace("%table%", table);
|
||||||
htmltext = htmltext.replaceAll("%win_count%", "" + winCount);
|
htmltext = htmltext.replaceAll("%win_count%", Integer.toString(winCount));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -683,7 +683,7 @@ public class L2Npc extends L2Character
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ public class FriendlyNpcInstance extends L2Attackable
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public final class L2FishermanInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ public class L2GuardInstance extends L2Attackable
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public class L2MerchantInstance extends L2NpcInstance
|
|||||||
String pom;
|
String pom;
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -413,7 +413,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace(search, "" + val);
|
html.replace(search, Integer.toString(val));
|
||||||
player.setRace(0, val);
|
player.setRace(0, val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -425,7 +425,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
filename = getHtmlPath(npcId, 3);
|
filename = getHtmlPath(npcId, 3);
|
||||||
html.setFile(player, filename);
|
html.setFile(player, filename);
|
||||||
html.replace("0place", "" + player.getRace(0));
|
html.replace("0place", Integer.toString(player.getRace(0)));
|
||||||
search = "Mob1";
|
search = "Mob1";
|
||||||
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
||||||
html.replace(search, replace);
|
html.replace(search, replace);
|
||||||
@@ -436,7 +436,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace(search, "" + _cost[val - 11]);
|
html.replace(search, Integer.toString(_cost[val - 11]));
|
||||||
player.setRace(1, val - 10);
|
player.setRace(1, val - 10);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -448,19 +448,19 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
filename = getHtmlPath(npcId, 4);
|
filename = getHtmlPath(npcId, 4);
|
||||||
html.setFile(player, filename);
|
html.setFile(player, filename);
|
||||||
html.replace("0place", "" + player.getRace(0));
|
html.replace("0place", Integer.toString(player.getRace(0)));
|
||||||
search = "Mob1";
|
search = "Mob1";
|
||||||
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
||||||
html.replace(search, replace);
|
html.replace(search, replace);
|
||||||
search = "0adena";
|
search = "0adena";
|
||||||
final int price = _cost[player.getRace(1) - 1];
|
final int price = _cost[player.getRace(1) - 1];
|
||||||
html.replace(search, "" + price);
|
html.replace(search, Integer.toString(price));
|
||||||
search = "0tax";
|
search = "0tax";
|
||||||
final int tax = 0;
|
final int tax = 0;
|
||||||
html.replace(search, "" + tax);
|
html.replace(search, Integer.toString(tax));
|
||||||
search = "0total";
|
search = "0total";
|
||||||
final int total = price + tax;
|
final int total = price + tax;
|
||||||
html.replace(search, "" + total);
|
html.replace(search, Integer.toString(total));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public class L2WarehouseInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (!st.hasMoreTokens())
|
if (!st.hasMoreTokens())
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
@@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce != null)
|
if (announce != null)
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ public class TerritoryStatus implements IBypassHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
html.replace("%castlename%", npc.getCastle().getName());
|
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()));
|
html.replace("%objectId%", String.valueOf(npc.getObjectId()));
|
||||||
{
|
{
|
||||||
if (npc.getCastle().getResidenceId() > 6)
|
if (npc.getCastle().getResidenceId() > 6)
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final int t = GameTimeController.getInstance().getGameTime();
|
final int t = GameTimeController.getInstance().getGameTime();
|
||||||
final String h = "" + ((t / 60) % 24);
|
final String h = Integer.toString(((t / 60) % 24));
|
||||||
String m;
|
String m;
|
||||||
if ((t % 60) < 10)
|
if ((t % 60) < 10)
|
||||||
{
|
{
|
||||||
@@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m = "" + (t % 60);
|
m = Integer.toString((t % 60));
|
||||||
}
|
}
|
||||||
|
|
||||||
SystemMessage sm;
|
SystemMessage sm;
|
||||||
|
|||||||
@@ -316,7 +316,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
final int i1 = getNumberFromBingoBoard(qs, i0);
|
final int i1 = getNumberFromBingoBoard(qs, i0);
|
||||||
if (isSelectedBingoNumber(qs, i1))
|
if (isSelectedBingoNumber(qs, i1))
|
||||||
{
|
{
|
||||||
html = html.replace("<?Cell" + (i0 + 1) + "?>", i1 + "");
|
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -332,7 +332,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
{
|
{
|
||||||
final int i1 = getNumberFromBingoBoard(qs, i0);
|
final int i1 = getNumberFromBingoBoard(qs, i0);
|
||||||
html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
|
html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
|
||||||
html = html.replace("<?Cell" + (i0 + 1) + "?>", i1 + "");
|
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
|
||||||
}
|
}
|
||||||
return html;
|
return html;
|
||||||
}
|
}
|
||||||
@@ -615,7 +615,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
{
|
{
|
||||||
if (i == pos)
|
if (i == pos)
|
||||||
{
|
{
|
||||||
selected[i] = num + "";
|
selected[i] = Integer.toString(num);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -634,7 +634,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
*/
|
*/
|
||||||
private boolean isSelectedBingoNumber(QuestState qs, int num)
|
private boolean isSelectedBingoNumber(QuestState qs, int num)
|
||||||
{
|
{
|
||||||
return qs.get("selected").contains(num + "");
|
return qs.get("selected").contains(Integer.toString(num));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -318,7 +318,7 @@ public class Q00663_SeductiveWhispers extends Quest
|
|||||||
isPlayerWin = true;
|
isPlayerWin = true;
|
||||||
htmltext = getHtm(player, isPractice ? "30846-07.html" : "30846-18.html");
|
htmltext = getHtm(player, isPractice ? "30846-07.html" : "30846-18.html");
|
||||||
htmltext = htmltext.replace("%table%", table);
|
htmltext = htmltext.replace("%table%", table);
|
||||||
htmltext = htmltext.replaceAll("%win_count%", "" + winCount);
|
htmltext = htmltext.replaceAll("%win_count%", Integer.toString(winCount));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest
|
|||||||
{
|
{
|
||||||
if ((player.getLevel() >= MIN_LEVEL))
|
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))
|
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);
|
takeItems(player, DARK_SOUL_STONE, -1);
|
||||||
giveItems(player, DAICHIR_SERTIFICATE, 1);
|
giveItems(player, DAICHIR_SERTIFICATE, 1);
|
||||||
addExpAndSp(player, EXP_AMOUNT, 0);
|
addExpAndSp(player, EXP_AMOUNT, 0);
|
||||||
qs.unset("" + ISTINA);
|
qs.unset(Integer.toString(ISTINA));
|
||||||
qs.unset("" + OCTAVIS);
|
qs.unset(Integer.toString(OCTAVIS));
|
||||||
qs.unset("" + TAUTI);
|
qs.unset(Integer.toString(TAUTI));
|
||||||
qs.unset("" + EKIMUS);
|
qs.unset(Integer.toString(EKIMUS));
|
||||||
qs.exitQuest(false, true);
|
qs.exitQuest(false, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -140,7 +140,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest
|
|||||||
}
|
}
|
||||||
case State.STARTED:
|
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";
|
htmltext = "30537-08.html";
|
||||||
}
|
}
|
||||||
@@ -179,7 +179,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
qs.set("" + npc.getId(), "true");
|
qs.set(Integer.toString(npc.getId()), "true");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -683,7 +683,7 @@ public class L2Npc extends L2Character
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ public class FriendlyNpcInstance extends L2Attackable
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public final class L2FishermanInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ public class L2GuardInstance extends L2Attackable
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public class L2MerchantInstance extends L2NpcInstance
|
|||||||
String pom;
|
String pom;
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -413,7 +413,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace(search, "" + val);
|
html.replace(search, Integer.toString(val));
|
||||||
player.setRace(0, val);
|
player.setRace(0, val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -425,7 +425,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
filename = getHtmlPath(npcId, 3);
|
filename = getHtmlPath(npcId, 3);
|
||||||
html.setFile(player, filename);
|
html.setFile(player, filename);
|
||||||
html.replace("0place", "" + player.getRace(0));
|
html.replace("0place", Integer.toString(player.getRace(0)));
|
||||||
search = "Mob1";
|
search = "Mob1";
|
||||||
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
||||||
html.replace(search, replace);
|
html.replace(search, replace);
|
||||||
@@ -436,7 +436,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace(search, "" + _cost[val - 11]);
|
html.replace(search, Integer.toString(_cost[val - 11]));
|
||||||
player.setRace(1, val - 10);
|
player.setRace(1, val - 10);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -448,19 +448,19 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
filename = getHtmlPath(npcId, 4);
|
filename = getHtmlPath(npcId, 4);
|
||||||
html.setFile(player, filename);
|
html.setFile(player, filename);
|
||||||
html.replace("0place", "" + player.getRace(0));
|
html.replace("0place", Integer.toString(player.getRace(0)));
|
||||||
search = "Mob1";
|
search = "Mob1";
|
||||||
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
||||||
html.replace(search, replace);
|
html.replace(search, replace);
|
||||||
search = "0adena";
|
search = "0adena";
|
||||||
final int price = _cost[player.getRace(1) - 1];
|
final int price = _cost[player.getRace(1) - 1];
|
||||||
html.replace(search, "" + price);
|
html.replace(search, Integer.toString(price));
|
||||||
search = "0tax";
|
search = "0tax";
|
||||||
final int tax = 0;
|
final int tax = 0;
|
||||||
html.replace(search, "" + tax);
|
html.replace(search, Integer.toString(tax));
|
||||||
search = "0total";
|
search = "0total";
|
||||||
final int total = price + tax;
|
final int total = price + tax;
|
||||||
html.replace(search, "" + total);
|
html.replace(search, Integer.toString(total));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public class L2WarehouseInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (!st.hasMoreTokens())
|
if (!st.hasMoreTokens())
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
@@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce != null)
|
if (announce != null)
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ public class TerritoryStatus implements IBypassHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
html.replace("%castlename%", npc.getCastle().getName());
|
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()));
|
html.replace("%objectId%", String.valueOf(npc.getObjectId()));
|
||||||
{
|
{
|
||||||
if (npc.getCastle().getResidenceId() > 6)
|
if (npc.getCastle().getResidenceId() > 6)
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final int t = GameTimeController.getInstance().getGameTime();
|
final int t = GameTimeController.getInstance().getGameTime();
|
||||||
final String h = "" + ((t / 60) % 24);
|
final String h = Integer.toString(((t / 60) % 24));
|
||||||
String m;
|
String m;
|
||||||
if ((t % 60) < 10)
|
if ((t % 60) < 10)
|
||||||
{
|
{
|
||||||
@@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m = "" + (t % 60);
|
m = Integer.toString((t % 60));
|
||||||
}
|
}
|
||||||
|
|
||||||
SystemMessage sm;
|
SystemMessage sm;
|
||||||
|
|||||||
@@ -316,7 +316,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
final int i1 = getNumberFromBingoBoard(qs, i0);
|
final int i1 = getNumberFromBingoBoard(qs, i0);
|
||||||
if (isSelectedBingoNumber(qs, i1))
|
if (isSelectedBingoNumber(qs, i1))
|
||||||
{
|
{
|
||||||
html = html.replace("<?Cell" + (i0 + 1) + "?>", i1 + "");
|
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -332,7 +332,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
{
|
{
|
||||||
final int i1 = getNumberFromBingoBoard(qs, i0);
|
final int i1 = getNumberFromBingoBoard(qs, i0);
|
||||||
html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
|
html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
|
||||||
html = html.replace("<?Cell" + (i0 + 1) + "?>", i1 + "");
|
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
|
||||||
}
|
}
|
||||||
return html;
|
return html;
|
||||||
}
|
}
|
||||||
@@ -615,7 +615,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
{
|
{
|
||||||
if (i == pos)
|
if (i == pos)
|
||||||
{
|
{
|
||||||
selected[i] = num + "";
|
selected[i] = Integer.toString(num);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -634,7 +634,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
*/
|
*/
|
||||||
private boolean isSelectedBingoNumber(QuestState qs, int num)
|
private boolean isSelectedBingoNumber(QuestState qs, int num)
|
||||||
{
|
{
|
||||||
return qs.get("selected").contains(num + "");
|
return qs.get("selected").contains(Integer.toString(num));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -318,7 +318,7 @@ public class Q00663_SeductiveWhispers extends Quest
|
|||||||
isPlayerWin = true;
|
isPlayerWin = true;
|
||||||
htmltext = getHtm(player, isPractice ? "30846-07.html" : "30846-18.html");
|
htmltext = getHtm(player, isPractice ? "30846-07.html" : "30846-18.html");
|
||||||
htmltext = htmltext.replace("%table%", table);
|
htmltext = htmltext.replace("%table%", table);
|
||||||
htmltext = htmltext.replaceAll("%win_count%", "" + winCount);
|
htmltext = htmltext.replaceAll("%win_count%", Integer.toString(winCount));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest
|
|||||||
{
|
{
|
||||||
if ((player.getLevel() >= MIN_LEVEL))
|
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))
|
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);
|
takeItems(player, DARK_SOUL_STONE, -1);
|
||||||
giveItems(player, DAICHIR_SERTIFICATE, 1);
|
giveItems(player, DAICHIR_SERTIFICATE, 1);
|
||||||
addExpAndSp(player, EXP_AMOUNT, 0);
|
addExpAndSp(player, EXP_AMOUNT, 0);
|
||||||
qs.unset("" + ISTINA);
|
qs.unset(Integer.toString(ISTINA));
|
||||||
qs.unset("" + OCTAVIS);
|
qs.unset(Integer.toString(OCTAVIS));
|
||||||
qs.unset("" + TAUTI);
|
qs.unset(Integer.toString(TAUTI));
|
||||||
qs.unset("" + EKIMUS);
|
qs.unset(Integer.toString(EKIMUS));
|
||||||
qs.exitQuest(false, true);
|
qs.exitQuest(false, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -140,7 +140,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest
|
|||||||
}
|
}
|
||||||
case State.STARTED:
|
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";
|
htmltext = "30537-08.html";
|
||||||
}
|
}
|
||||||
@@ -179,7 +179,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
qs.set("" + npc.getId(), "true");
|
qs.set(Integer.toString(npc.getId()), "true");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -683,7 +683,7 @@ public class L2Npc extends L2Character
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ public class FriendlyNpcInstance extends L2Attackable
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public final class L2FishermanInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ public class L2GuardInstance extends L2Attackable
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public class L2MerchantInstance extends L2NpcInstance
|
|||||||
String pom;
|
String pom;
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -413,7 +413,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace(search, "" + val);
|
html.replace(search, Integer.toString(val));
|
||||||
player.setRace(0, val);
|
player.setRace(0, val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -425,7 +425,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
filename = getHtmlPath(npcId, 3);
|
filename = getHtmlPath(npcId, 3);
|
||||||
html.setFile(player, filename);
|
html.setFile(player, filename);
|
||||||
html.replace("0place", "" + player.getRace(0));
|
html.replace("0place", Integer.toString(player.getRace(0)));
|
||||||
search = "Mob1";
|
search = "Mob1";
|
||||||
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
||||||
html.replace(search, replace);
|
html.replace(search, replace);
|
||||||
@@ -436,7 +436,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace(search, "" + _cost[val - 11]);
|
html.replace(search, Integer.toString(_cost[val - 11]));
|
||||||
player.setRace(1, val - 10);
|
player.setRace(1, val - 10);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -448,19 +448,19 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
filename = getHtmlPath(npcId, 4);
|
filename = getHtmlPath(npcId, 4);
|
||||||
html.setFile(player, filename);
|
html.setFile(player, filename);
|
||||||
html.replace("0place", "" + player.getRace(0));
|
html.replace("0place", Integer.toString(player.getRace(0)));
|
||||||
search = "Mob1";
|
search = "Mob1";
|
||||||
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
||||||
html.replace(search, replace);
|
html.replace(search, replace);
|
||||||
search = "0adena";
|
search = "0adena";
|
||||||
final int price = _cost[player.getRace(1) - 1];
|
final int price = _cost[player.getRace(1) - 1];
|
||||||
html.replace(search, "" + price);
|
html.replace(search, Integer.toString(price));
|
||||||
search = "0tax";
|
search = "0tax";
|
||||||
final int tax = 0;
|
final int tax = 0;
|
||||||
html.replace(search, "" + tax);
|
html.replace(search, Integer.toString(tax));
|
||||||
search = "0total";
|
search = "0total";
|
||||||
final int total = price + tax;
|
final int total = price + tax;
|
||||||
html.replace(search, "" + total);
|
html.replace(search, Integer.toString(total));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public class L2WarehouseInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (!st.hasMoreTokens())
|
if (!st.hasMoreTokens())
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
@@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce != null)
|
if (announce != null)
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ public class TerritoryStatus implements IBypassHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
html.replace("%castlename%", npc.getCastle().getName());
|
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()));
|
html.replace("%objectId%", String.valueOf(npc.getObjectId()));
|
||||||
{
|
{
|
||||||
if (npc.getCastle().getResidenceId() > 6)
|
if (npc.getCastle().getResidenceId() > 6)
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final int t = GameTimeController.getInstance().getGameTime();
|
final int t = GameTimeController.getInstance().getGameTime();
|
||||||
final String h = "" + ((t / 60) % 24);
|
final String h = Integer.toString(((t / 60) % 24));
|
||||||
String m;
|
String m;
|
||||||
if ((t % 60) < 10)
|
if ((t % 60) < 10)
|
||||||
{
|
{
|
||||||
@@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m = "" + (t % 60);
|
m = Integer.toString((t % 60));
|
||||||
}
|
}
|
||||||
|
|
||||||
SystemMessage sm;
|
SystemMessage sm;
|
||||||
|
|||||||
@@ -316,7 +316,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
final int i1 = getNumberFromBingoBoard(qs, i0);
|
final int i1 = getNumberFromBingoBoard(qs, i0);
|
||||||
if (isSelectedBingoNumber(qs, i1))
|
if (isSelectedBingoNumber(qs, i1))
|
||||||
{
|
{
|
||||||
html = html.replace("<?Cell" + (i0 + 1) + "?>", i1 + "");
|
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -332,7 +332,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
{
|
{
|
||||||
final int i1 = getNumberFromBingoBoard(qs, i0);
|
final int i1 = getNumberFromBingoBoard(qs, i0);
|
||||||
html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
|
html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
|
||||||
html = html.replace("<?Cell" + (i0 + 1) + "?>", i1 + "");
|
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
|
||||||
}
|
}
|
||||||
return html;
|
return html;
|
||||||
}
|
}
|
||||||
@@ -615,7 +615,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
{
|
{
|
||||||
if (i == pos)
|
if (i == pos)
|
||||||
{
|
{
|
||||||
selected[i] = num + "";
|
selected[i] = Integer.toString(num);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -634,7 +634,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
*/
|
*/
|
||||||
private boolean isSelectedBingoNumber(QuestState qs, int num)
|
private boolean isSelectedBingoNumber(QuestState qs, int num)
|
||||||
{
|
{
|
||||||
return qs.get("selected").contains(num + "");
|
return qs.get("selected").contains(Integer.toString(num));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -318,7 +318,7 @@ public class Q00663_SeductiveWhispers extends Quest
|
|||||||
isPlayerWin = true;
|
isPlayerWin = true;
|
||||||
htmltext = getHtm(player, isPractice ? "30846-07.html" : "30846-18.html");
|
htmltext = getHtm(player, isPractice ? "30846-07.html" : "30846-18.html");
|
||||||
htmltext = htmltext.replace("%table%", table);
|
htmltext = htmltext.replace("%table%", table);
|
||||||
htmltext = htmltext.replaceAll("%win_count%", "" + winCount);
|
htmltext = htmltext.replaceAll("%win_count%", Integer.toString(winCount));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest
|
|||||||
{
|
{
|
||||||
if ((player.getLevel() >= MIN_LEVEL))
|
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))
|
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);
|
takeItems(player, DARK_SOUL_STONE, -1);
|
||||||
giveItems(player, DAICHIR_SERTIFICATE, 1);
|
giveItems(player, DAICHIR_SERTIFICATE, 1);
|
||||||
addExpAndSp(player, EXP_AMOUNT, 0);
|
addExpAndSp(player, EXP_AMOUNT, 0);
|
||||||
qs.unset("" + ISTINA);
|
qs.unset(Integer.toString(ISTINA));
|
||||||
qs.unset("" + OCTAVIS);
|
qs.unset(Integer.toString(OCTAVIS));
|
||||||
qs.unset("" + TAUTI);
|
qs.unset(Integer.toString(TAUTI));
|
||||||
qs.unset("" + EKIMUS);
|
qs.unset(Integer.toString(EKIMUS));
|
||||||
qs.exitQuest(false, true);
|
qs.exitQuest(false, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -140,7 +140,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest
|
|||||||
}
|
}
|
||||||
case State.STARTED:
|
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";
|
htmltext = "30537-08.html";
|
||||||
}
|
}
|
||||||
@@ -179,7 +179,7 @@ public final class Q10818_ConfrontingAGiantMonster extends Quest
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
qs.set("" + npc.getId(), "true");
|
qs.set(Integer.toString(npc.getId()), "true");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -683,7 +683,7 @@ public class L2Npc extends L2Character
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ public class FriendlyNpcInstance extends L2Attackable
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public final class L2FishermanInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ public class L2GuardInstance extends L2Attackable
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public class L2MerchantInstance extends L2NpcInstance
|
|||||||
String pom;
|
String pom;
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -413,7 +413,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace(search, "" + val);
|
html.replace(search, Integer.toString(val));
|
||||||
player.setRace(0, val);
|
player.setRace(0, val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -425,7 +425,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
filename = getHtmlPath(npcId, 3);
|
filename = getHtmlPath(npcId, 3);
|
||||||
html.setFile(player, filename);
|
html.setFile(player, filename);
|
||||||
html.replace("0place", "" + player.getRace(0));
|
html.replace("0place", Integer.toString(player.getRace(0)));
|
||||||
search = "Mob1";
|
search = "Mob1";
|
||||||
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
||||||
html.replace(search, replace);
|
html.replace(search, replace);
|
||||||
@@ -436,7 +436,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace(search, "" + _cost[val - 11]);
|
html.replace(search, Integer.toString(_cost[val - 11]));
|
||||||
player.setRace(1, val - 10);
|
player.setRace(1, val - 10);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -448,19 +448,19 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
filename = getHtmlPath(npcId, 4);
|
filename = getHtmlPath(npcId, 4);
|
||||||
html.setFile(player, filename);
|
html.setFile(player, filename);
|
||||||
html.replace("0place", "" + player.getRace(0));
|
html.replace("0place", Integer.toString(player.getRace(0)));
|
||||||
search = "Mob1";
|
search = "Mob1";
|
||||||
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
||||||
html.replace(search, replace);
|
html.replace(search, replace);
|
||||||
search = "0adena";
|
search = "0adena";
|
||||||
final int price = _cost[player.getRace(1) - 1];
|
final int price = _cost[player.getRace(1) - 1];
|
||||||
html.replace(search, "" + price);
|
html.replace(search, Integer.toString(price));
|
||||||
search = "0tax";
|
search = "0tax";
|
||||||
final int tax = 0;
|
final int tax = 0;
|
||||||
html.replace(search, "" + tax);
|
html.replace(search, Integer.toString(tax));
|
||||||
search = "0total";
|
search = "0total";
|
||||||
final int total = price + tax;
|
final int total = price + tax;
|
||||||
html.replace(search, "" + total);
|
html.replace(search, Integer.toString(total));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public class L2WarehouseInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (!st.hasMoreTokens())
|
if (!st.hasMoreTokens())
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
@@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce != null)
|
if (announce != null)
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
|
|||||||
@@ -334,13 +334,13 @@ public class Loto implements IBypassHandler
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
html.replace("%objectId%", String.valueOf(npc.getObjectId()));
|
html.replace("%objectId%", String.valueOf(npc.getObjectId()));
|
||||||
html.replace("%race%", "" + Lottery.getInstance().getId());
|
html.replace("%race%", Integer.toString(Lottery.getInstance().getId()));
|
||||||
html.replace("%adena%", "" + Lottery.getInstance().getPrize());
|
html.replace("%adena%", Long.toString(Lottery.getInstance().getPrize()));
|
||||||
html.replace("%ticket_price%", "" + Config.ALT_LOTTERY_TICKET_PRICE);
|
html.replace("%ticket_price%", Long.toString(Config.ALT_LOTTERY_TICKET_PRICE));
|
||||||
html.replace("%prize5%", "" + (Config.ALT_LOTTERY_5_NUMBER_RATE * 100));
|
html.replace("%prize5%", Float.toString(Config.ALT_LOTTERY_5_NUMBER_RATE * 100));
|
||||||
html.replace("%prize4%", "" + (Config.ALT_LOTTERY_4_NUMBER_RATE * 100));
|
html.replace("%prize4%", Float.toString(Config.ALT_LOTTERY_4_NUMBER_RATE * 100));
|
||||||
html.replace("%prize3%", "" + (Config.ALT_LOTTERY_3_NUMBER_RATE * 100));
|
html.replace("%prize3%", Float.toString(Config.ALT_LOTTERY_3_NUMBER_RATE * 100));
|
||||||
html.replace("%prize2%", "" + Config.ALT_LOTTERY_2_AND_1_NUMBER_PRIZE);
|
html.replace("%prize2%", Long.toString(Config.ALT_LOTTERY_2_AND_1_NUMBER_PRIZE));
|
||||||
html.replace("%enddate%", "" + DateFormat.getDateInstance().format(Lottery.getInstance().getEndDate()));
|
html.replace("%enddate%", "" + DateFormat.getDateInstance().format(Lottery.getInstance().getEndDate()));
|
||||||
player.sendPacket(html);
|
player.sendPacket(html);
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public class TerritoryStatus implements IBypassHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
html.replace("%castlename%", npc.getCastle().getName());
|
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()));
|
html.replace("%objectId%", String.valueOf(npc.getObjectId()));
|
||||||
{
|
{
|
||||||
if (npc.getCastle().getResidenceId() > 6)
|
if (npc.getCastle().getResidenceId() > 6)
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final int t = GameTimeController.getInstance().getGameTime();
|
final int t = GameTimeController.getInstance().getGameTime();
|
||||||
final String h = "" + ((t / 60) % 24);
|
final String h = Integer.toString(((t / 60) % 24));
|
||||||
String m;
|
String m;
|
||||||
if ((t % 60) < 10)
|
if ((t % 60) < 10)
|
||||||
{
|
{
|
||||||
@@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m = "" + (t % 60);
|
m = Integer.toString((t % 60));
|
||||||
}
|
}
|
||||||
|
|
||||||
SystemMessage sm;
|
SystemMessage sm;
|
||||||
|
|||||||
@@ -362,7 +362,7 @@ public final class Q00384_WarehouseKeepersPastime extends Quest
|
|||||||
int i1 = getNumberFromBingoBoard(qs, i0);
|
int i1 = getNumberFromBingoBoard(qs, i0);
|
||||||
if (isSelectedBingoNumber(qs, i1))
|
if (isSelectedBingoNumber(qs, i1))
|
||||||
{
|
{
|
||||||
html = html.replace("<?Cell" + (i0 + 1) + "?>", i1 + "");
|
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -378,7 +378,7 @@ public final class Q00384_WarehouseKeepersPastime extends Quest
|
|||||||
{
|
{
|
||||||
int i1 = getNumberFromBingoBoard(qs, i0);
|
int i1 = getNumberFromBingoBoard(qs, i0);
|
||||||
html = html.replace("<?FontColor" + (i0 + 1) + "?>", (isSelectedBingoNumber(qs, i1)) ? "ff0000" : "ffffff");
|
html = html.replace("<?FontColor" + (i0 + 1) + "?>", (isSelectedBingoNumber(qs, i1)) ? "ff0000" : "ffffff");
|
||||||
html = html.replace("<?Cell" + (i0 + 1) + "?>", i1 + "");
|
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
|
||||||
}
|
}
|
||||||
return html;
|
return html;
|
||||||
}
|
}
|
||||||
@@ -596,7 +596,7 @@ public final class Q00384_WarehouseKeepersPastime extends Quest
|
|||||||
{
|
{
|
||||||
if (i == pos)
|
if (i == pos)
|
||||||
{
|
{
|
||||||
selected[i] = num + "";
|
selected[i] = Integer.toString(num);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -615,7 +615,7 @@ public final class Q00384_WarehouseKeepersPastime extends Quest
|
|||||||
*/
|
*/
|
||||||
private boolean isSelectedBingoNumber(QuestState qs, int num)
|
private boolean isSelectedBingoNumber(QuestState qs, int num)
|
||||||
{
|
{
|
||||||
return qs.get("selected").contains(num + "");
|
return qs.get("selected").contains(Integer.toString(num));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -325,7 +325,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
final int i1 = getNumberFromBingoBoard(qs, i0);
|
final int i1 = getNumberFromBingoBoard(qs, i0);
|
||||||
if (isSelectedBingoNumber(qs, i1))
|
if (isSelectedBingoNumber(qs, i1))
|
||||||
{
|
{
|
||||||
html = html.replace("<?Cell" + (i0 + 1) + "?>", i1 + "");
|
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -341,7 +341,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
{
|
{
|
||||||
final int i1 = getNumberFromBingoBoard(qs, i0);
|
final int i1 = getNumberFromBingoBoard(qs, i0);
|
||||||
html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
|
html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
|
||||||
html = html.replace("<?Cell" + (i0 + 1) + "?>", i1 + "");
|
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
|
||||||
}
|
}
|
||||||
return html;
|
return html;
|
||||||
}
|
}
|
||||||
@@ -624,7 +624,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
{
|
{
|
||||||
if (i == pos)
|
if (i == pos)
|
||||||
{
|
{
|
||||||
selected[i] = num + "";
|
selected[i] = Integer.toString(num);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -643,7 +643,7 @@ public final class Q00386_StolenDignity extends Quest
|
|||||||
*/
|
*/
|
||||||
private boolean isSelectedBingoNumber(QuestState qs, int num)
|
private boolean isSelectedBingoNumber(QuestState qs, int num)
|
||||||
{
|
{
|
||||||
return qs.get("selected").contains(num + "");
|
return qs.get("selected").contains(Integer.toString(num));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -831,7 +831,7 @@ public class L2Npc extends L2Character
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ public class L2AdventurerInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ public class L2DungeonGatekeeperInstance extends L2Npc
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public final class L2FishermanInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ public class L2GuardInstance extends L2Attackable
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ public class L2MerchantInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -370,7 +370,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace(search, "" + val);
|
html.replace(search, Integer.toString(val));
|
||||||
player.setRace(0, val);
|
player.setRace(0, val);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -382,7 +382,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
filename = getHtmlPath(npcId, 3);
|
filename = getHtmlPath(npcId, 3);
|
||||||
html.setFile(player, filename);
|
html.setFile(player, filename);
|
||||||
html.replace("0place", "" + player.getRace(0));
|
html.replace("0place", Integer.toString(player.getRace(0)));
|
||||||
search = "Mob1";
|
search = "Mob1";
|
||||||
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
||||||
html.replace(search, replace);
|
html.replace(search, replace);
|
||||||
@@ -393,7 +393,7 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
html.replace(search, "" + _cost[val - 11]);
|
html.replace(search, Integer.toString(_cost[val - 11]));
|
||||||
player.setRace(1, val - 10);
|
player.setRace(1, val - 10);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -405,19 +405,19 @@ public class L2RaceManagerInstance extends L2Npc
|
|||||||
}
|
}
|
||||||
filename = getHtmlPath(npcId, 4);
|
filename = getHtmlPath(npcId, 4);
|
||||||
html.setFile(player, filename);
|
html.setFile(player, filename);
|
||||||
html.replace("0place", "" + player.getRace(0));
|
html.replace("0place", Integer.toString(player.getRace(0)));
|
||||||
search = "Mob1";
|
search = "Mob1";
|
||||||
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
|
||||||
html.replace(search, replace);
|
html.replace(search, replace);
|
||||||
search = "0adena";
|
search = "0adena";
|
||||||
final int price = _cost[player.getRace(1) - 1];
|
final int price = _cost[player.getRace(1) - 1];
|
||||||
html.replace(search, "" + price);
|
html.replace(search, Integer.toString(price));
|
||||||
search = "0tax";
|
search = "0tax";
|
||||||
final int tax = 0;
|
final int tax = 0;
|
||||||
html.replace(search, "" + tax);
|
html.replace(search, Integer.toString(tax));
|
||||||
search = "0total";
|
search = "0total";
|
||||||
final int total = price + tax;
|
final int total = price + tax;
|
||||||
html.replace(search, "" + total);
|
html.replace(search, Integer.toString(total));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -229,7 +229,7 @@ public class L2SchemeBufferInstance extends L2Npc
|
|||||||
String filename = "";
|
String filename = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
filename = "" + npcId;
|
filename = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -258,7 +258,7 @@ public class L2SepulcherNpcInstance extends L2Npc
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ public final class L2TeleporterInstance extends L2Npc
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ public class L2TrainerInstance extends L2NpcInstance
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ public class L2WarehouseInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (!st.hasMoreTokens())
|
if (!st.hasMoreTokens())
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
@@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce != null)
|
if (announce != null)
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ public class TerritoryStatus implements IBypassHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
html.replace("%castlename%", npc.getCastle().getName());
|
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()));
|
html.replace("%objectId%", String.valueOf(npc.getObjectId()));
|
||||||
{
|
{
|
||||||
if (npc.getCastle().getResidenceId() > 6)
|
if (npc.getCastle().getResidenceId() > 6)
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final int t = GameTimeController.getInstance().getGameTime();
|
final int t = GameTimeController.getInstance().getGameTime();
|
||||||
final String h = "" + ((t / 60) % 24);
|
final String h = Integer.toString(((t / 60) % 24));
|
||||||
String m;
|
String m;
|
||||||
if ((t % 60) < 10)
|
if ((t % 60) < 10)
|
||||||
{
|
{
|
||||||
@@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m = "" + (t % 60);
|
m = Integer.toString((t % 60));
|
||||||
}
|
}
|
||||||
|
|
||||||
SystemMessage sm;
|
SystemMessage sm;
|
||||||
|
|||||||
@@ -683,7 +683,7 @@ public class L2Npc extends L2Character
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ public class FriendlyNpcInstance extends L2Attackable
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public final class L2FishermanInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ public class L2GuardInstance extends L2Attackable
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public class L2MerchantInstance extends L2NpcInstance
|
|||||||
String pom;
|
String pom;
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ public class L2PetManagerInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -229,7 +229,7 @@ public class L2SchemeBufferInstance extends L2Npc
|
|||||||
String filename = "";
|
String filename = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
filename = "" + npcId;
|
filename = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public class L2WarehouseInstance extends L2NpcInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (!st.hasMoreTokens())
|
if (!st.hasMoreTokens())
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-edit.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -203,9 +203,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
@@ -419,7 +419,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce != null)
|
if (announce != null)
|
||||||
{
|
{
|
||||||
String content = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/announces-show.htm");
|
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();
|
final String announcementType = announce.getType().name();
|
||||||
String announcementInital = "0";
|
String announcementInital = "0";
|
||||||
String announcementDelay = "0";
|
String announcementDelay = "0";
|
||||||
@@ -429,9 +429,9 @@ public class AdminAnnouncements implements IAdminCommandHandler
|
|||||||
if (announce instanceof AutoAnnouncement)
|
if (announce instanceof AutoAnnouncement)
|
||||||
{
|
{
|
||||||
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
final AutoAnnouncement autoAnnounce = (AutoAnnouncement) announce;
|
||||||
announcementInital = "" + (autoAnnounce.getInitial() / 1000);
|
announcementInital = Long.toString(autoAnnounce.getInitial() / 1000);
|
||||||
announcementDelay = "" + (autoAnnounce.getDelay() / 1000);
|
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
|
||||||
announcementRepeat = "" + autoAnnounce.getRepeat();
|
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
|
||||||
}
|
}
|
||||||
content = content.replaceAll("%id%", announcementId);
|
content = content.replaceAll("%id%", announcementId);
|
||||||
content = content.replaceAll("%type%", announcementType);
|
content = content.replaceAll("%type%", announcementType);
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ public class TerritoryStatus implements IBypassHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
html.replace("%castlename%", npc.getCastle().getName());
|
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()));
|
html.replace("%objectId%", String.valueOf(npc.getObjectId()));
|
||||||
{
|
{
|
||||||
if (npc.getCastle().getResidenceId() > 6)
|
if (npc.getCastle().getResidenceId() > 6)
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
|
|
||||||
final int t = GameTimeController.getInstance().getGameTime();
|
final int t = GameTimeController.getInstance().getGameTime();
|
||||||
final String h = "" + ((t / 60) % 24);
|
final String h = Integer.toString(((t / 60) % 24));
|
||||||
String m;
|
String m;
|
||||||
if ((t % 60) < 10)
|
if ((t % 60) < 10)
|
||||||
{
|
{
|
||||||
@@ -55,7 +55,7 @@ public class Time implements IUserCommandHandler
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m = "" + (t % 60);
|
m = Integer.toString((t % 60));
|
||||||
}
|
}
|
||||||
|
|
||||||
SystemMessage sm;
|
SystemMessage sm;
|
||||||
|
|||||||
@@ -683,7 +683,7 @@ public class L2Npc extends L2Character
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ public class FriendlyNpcInstance extends L2Attackable
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ public final class L2FishermanInstance extends L2MerchantInstance
|
|||||||
|
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ public class L2GuardInstance extends L2Attackable
|
|||||||
String pom = "";
|
String pom = "";
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public class L2MerchantInstance extends L2NpcInstance
|
|||||||
String pom;
|
String pom;
|
||||||
if (val == 0)
|
if (val == 0)
|
||||||
{
|
{
|
||||||
pom = "" + npcId;
|
pom = Integer.toString(npcId);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user