lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor code improvements.

Browse Source
This commit is contained in:
MobiusDev
2017-08-29 23:02:08 +00:00
parent 9be051a70f
commit 224f9331f7
130 changed files with 403 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSigns.java
View File

@@ -425,7 +425,7 @@ public class SevenSigns
return reward;
}
public static final String getCabalShortName(int cabal)
public static String getCabalShortName(int cabal)
{
switch (cabal)
{
@@ -438,7 +438,7 @@ public class SevenSigns
return "No Cabal";
}
public static final String getCabalName(int cabal)
public static String getCabalName(int cabal)
{
switch (cabal)
{
@@ -451,7 +451,7 @@ public class SevenSigns
return "No Cabal";
}
public static final String getSealName(int seal, boolean shortName)
public static String getSealName(int seal, boolean shortName)
{
String sealName = (!shortName) ? "Seal of " : "";

10
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java
View File

@@ -809,7 +809,7 @@ public class SevenSignsFestival implements SpawnListener
* @param festivalID
* @return String festivalName
*/
public static final String getFestivalName(int festivalID)
public static String getFestivalName(int festivalID)
{
String festivalName;
@@ -840,7 +840,7 @@ public class SevenSignsFestival implements SpawnListener
* @param festivalId
* @return int maxLevel
*/
public static final int getMaxLevelForFestival(int festivalId)
public static int getMaxLevelForFestival(int festivalId)
{
int maxLevel = (ExperienceData.getInstance().getMaxLevel() - 1);
@@ -868,7 +868,7 @@ public class SevenSignsFestival implements SpawnListener
* @param npcId
* @return boolean isArcher
*/
protected static final boolean isFestivalArcher(int npcId)
protected static boolean isFestivalArcher(int npcId)
{
if ((npcId < 18009) || (npcId > 18108))
{
@@ -884,7 +884,7 @@ public class SevenSignsFestival implements SpawnListener
* @param npcId
* @return boolean isChest
*/
protected static final boolean isFestivalChest(int npcId)
protected static boolean isFestivalChest(int npcId)
{
return ((npcId < 18109) || (npcId > 18118));
}
@@ -980,7 +980,7 @@ public class SevenSignsFestival implements SpawnListener
for (int i = 0; i < FESTIVAL_COUNT; i++)
{
_accumulatedBonuses.add(i, rs.getInt("accumulated_bonus" + String.valueOf(i)));
_accumulatedBonuses.add(i, rs.getInt("accumulated_bonus" + i));
}
}
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemData.java
View File

@@ -153,7 +153,7 @@ public class EnchantItemData implements IXmlReader
* Gets the single instance of EnchantItemData.
* @return single instance of EnchantItemData
*/
public static final EnchantItemData getInstance()
public static EnchantItemData getInstance()
{
return SingletonHolder._instance;
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/EnchantItemHPBonusData.java
View File

@@ -142,7 +142,7 @@ public class EnchantItemHPBonusData implements IXmlReader
* Gets the single instance of EnchantHPBonusData.
* @return single instance of EnchantHPBonusData
*/
public static final EnchantItemHPBonusData getInstance()
public static EnchantItemHPBonusData getInstance()
{
return SingletonHolder._instance;
}

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/MultisellData.java
View File

@@ -278,7 +278,7 @@ public final class MultisellData implements IXmlReader
separateAndSend(listId, player, npc, inventoryOnly, 1, 1);
}
public static final boolean hasSpecialIngredient(int id, long amount, L2PcInstance player)
public static boolean hasSpecialIngredient(int id, long amount, L2PcInstance player)
{
switch (id)
{
@@ -310,7 +310,7 @@ public final class MultisellData implements IXmlReader
return false;
}
public static final boolean takeSpecialIngredient(int id, long amount, L2PcInstance player)
public static boolean takeSpecialIngredient(int id, long amount, L2PcInstance player)
{
switch (id)
{
@@ -329,7 +329,7 @@ public final class MultisellData implements IXmlReader
return false;
}
public static final void giveSpecialProduct(int id, long amount, L2PcInstance player)
public static void giveSpecialProduct(int id, long amount, L2PcInstance player)
{
switch (id)
{

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/SiegeScheduleData.java
View File

@@ -111,7 +111,7 @@ public class SiegeScheduleData implements IXmlReader
return _scheduleData;
}
public static final SiegeScheduleData getInstance()
public static SiegeScheduleData getInstance()
{
return SingletonHolder._instance;
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/AugmentationData.java
View File

@@ -998,7 +998,7 @@ public class AugmentationData
return new L2Augmentation(((stat34 << 16) + stat12));
}
public static final AugmentationData getInstance()
public static AugmentationData getInstance()
{
return SingletonHolder._instance;
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/datatables/MerchantPriceConfigTable.java
View File

@@ -100,7 +100,7 @@ public class MerchantPriceConfigTable implements InstanceListManager
}
}
final MerchantPriceConfig defaultMpc = this.getMerchantPriceConfig(defaultPriceConfigId);
final MerchantPriceConfig defaultMpc = getMerchantPriceConfig(defaultPriceConfigId);
if (defaultMpc == null)
{
throw new IllegalStateException("'defaultPriceConfig' points to an non-loaded priceConfig");

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/engines/DocumentBase.java
View File

@@ -1264,7 +1264,7 @@ public abstract class DocumentBase
final char ch = value.isEmpty() ? ' ' : value.charAt(0);
if ((ch == '#') || (ch == '-') || Character.isDigit(ch))
{
set.set(name, String.valueOf(getValue(value, level)));
set.set(name, getValue(value, level));
}
else
{

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/CastleManorManager.java
View File

@@ -107,7 +107,7 @@ public final class CastleManorManager implements IXmlReader, IStorable
// Send debug message
if (Config.DEBUG)
{
LOGGER.info(getClass().getSimpleName() + ": Current mode " + _mode.toString());
LOGGER.info(getClass().getSimpleName() + ": Current mode " + _mode);
}
}
else
@@ -432,7 +432,7 @@ public final class CastleManorManager implements IXmlReader, IStorable
scheduleModeChange();
if (Config.DEBUG)
{
LOGGER.info(getClass().getName() + ": Manor mode changed to " + _mode.toString() + "!");
LOGGER.info(getClass().getName() + ": Manor mode changed to " + _mode + "!");
}
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ClanHallAuctionManager.java
View File

@@ -176,7 +176,7 @@ public final class ClanHallAuctionManager
}
}
public static final ClanHallAuctionManager getInstance()
public static ClanHallAuctionManager getInstance()
{
return SingletonHolder._instance;
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/DuelManager.java
View File

@@ -219,7 +219,7 @@ public final class DuelManager
return ARENAS.get(Rnd.get(ARENAS.size()));
}
public static final DuelManager getInstance()
public static DuelManager getInstance()
{
return SingletonHolder._instance;
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java
View File

@@ -167,7 +167,7 @@ public class RaidBossPointsManager
return tmpRanking;
}
public static final RaidBossPointsManager getInstance()
public static RaidBossPointsManager getInstance()
{
return SingletonHolder._instance;
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ServerRestartManager.java
View File

@@ -72,7 +72,7 @@ public class ServerRestartManager
{
nextRestartTime = new SimpleDateFormat("HH:mm").format(lastRestart.getTime());
ThreadPoolManager.schedule(new ServerRestartTask(), lastDelay - (Config.SERVER_RESTART_SCHEDULE_COUNTDOWN * 1000));
_log.info("Scheduled server restart at " + lastRestart.getTime().toString() + ".");
_log.info("Scheduled server restart at " + lastRestart.getTime() + ".");
}
}
catch (Exception e)

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoDManager.java
View File

@@ -204,7 +204,7 @@ public final class SoDManager
* Gets the single instance of {@code GraciaSeedsManager}.
* @return single instance of {@code GraciaSeedsManager}
*/
public static final SoDManager getInstance()
public static SoDManager getInstance()
{
return SingletonHolder._instance;
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/SoIManager.java
View File

@@ -251,7 +251,7 @@ public class SoIManager
* Gets the single instance of {@code GraciaSeedsManager}.
* @return single instance of {@code GraciaSeedsManager}
*/
public static final SoIManager getInstance()
public static SoIManager getInstance()
{
return SingletonHolder._instance;
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java
View File

@@ -1789,7 +1789,7 @@ public final class TerritoryWarManager implements Siegable
}
public static final TerritoryWarManager getInstance()
public static TerritoryWarManager getInstance()
{
return SingletonHolder._instance;
}

14
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -2171,7 +2171,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
* @param itemObjId the item object ID
* @return if the item has a reuse time stamp, the remaining time, otherwise -1
*/
public synchronized final long getItemRemainingReuseTime(int itemObjId)
public final synchronized long getItemRemainingReuseTime(int itemObjId)
{
final TimeStamp reuseStamp = (_reuseTimeStampsItems != null) ? _reuseTimeStampsItems.get(itemObjId) : null;
return reuseStamp != null ? reuseStamp.getRemaining() : -1;
@@ -2242,7 +2242,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
* Removes a skill reuse time stamp.
* @param skill the skill to remove
*/
public synchronized final void removeTimeStamp(Skill skill)
public final synchronized void removeTimeStamp(Skill skill)
{
if (_reuseTimeStampsSkills != null)
{
@@ -2253,7 +2253,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
/**
* Removes all skill reuse time stamps.
*/
public synchronized final void resetTimeStamps()
public final synchronized void resetTimeStamps()
{
if (_reuseTimeStampsSkills != null)
{
@@ -2266,7 +2266,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
* @param hashCode the skill hash code
* @return if the skill has a reuse time stamp, the remaining time, otherwise -1
*/
public synchronized final long getSkillRemainingReuseTime(int hashCode)
public final synchronized long getSkillRemainingReuseTime(int hashCode)
{
final TimeStamp reuseStamp = (_reuseTimeStampsSkills != null) ? _reuseTimeStampsSkills.get(hashCode) : null;
return reuseStamp != null ? reuseStamp.getRemaining() : -1;
@@ -2277,7 +2277,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
* @param hashCode the skill hash code
* @return {@code true} if the skill is under reuse time, {@code false} otherwise
*/
public synchronized final boolean hasSkillReuse(int hashCode)
public final synchronized boolean hasSkillReuse(int hashCode)
{
final TimeStamp reuseStamp = (_reuseTimeStampsSkills != null) ? _reuseTimeStampsSkills.get(hashCode) : null;
return (reuseStamp != null) && reuseStamp.hasNotPassed();
@@ -2288,7 +2288,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
* @param hashCode the skill hash code
* @return if the skill has a reuse time stamp, the skill reuse time stamp, otherwise {@code null}
*/
public synchronized final TimeStamp getSkillReuseTimeStamp(int hashCode)
public final synchronized TimeStamp getSkillReuseTimeStamp(int hashCode)
{
return _reuseTimeStampsSkills != null ? _reuseTimeStampsSkills.get(hashCode) : null;
}
@@ -2345,7 +2345,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
/**
* Removes all the disabled skills.
*/
public synchronized final void resetDisabledSkills()
public final synchronized void resetDisabledSkills()
{
if (_disabledSkills != null)
{

16
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2AuctioneerInstance.java
View File

@@ -113,7 +113,7 @@ public final class L2AuctioneerInstance extends L2Npc
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
html.setFile(player.getHtmlPrefix(), filename);
html.replace("%x%", val);
html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate())));
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
html.replace("%AGIT_AUCTION_MIN%", String.valueOf(a.getStartingBid()));
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getDesc());
@@ -181,8 +181,8 @@ public final class L2AuctioneerInstance extends L2Npc
html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10));
html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate())));
html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf((((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60)) + " minutes");
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
html.replace("%AGIT_AUCTION_COUNT%", String.valueOf(a.getBidders().size()));
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
@@ -424,8 +424,8 @@ public final class L2AuctioneerInstance extends L2Npc
html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10));
html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate())));
html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf((((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60)) + " minutes");
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
html.replace("%AGIT_AUCTION_MYBID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid()));
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
@@ -455,8 +455,8 @@ public final class L2AuctioneerInstance extends L2Npc
html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10));
html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate())));
html.replace("%AGIT_AUCTION_REMAIN%", String.valueOf((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + String.valueOf((((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60)) + " minutes");
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
html.replace("%AGIT_AUCTION_REMAIN%", (a.getEndDate() - System.currentTimeMillis()) / 3600000 + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
html.replace("%AGIT_AUCTION_BIDCOUNT%", String.valueOf(a.getBidders().size()));
html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
@@ -613,7 +613,7 @@ public final class L2AuctioneerInstance extends L2Npc
{
html.replace("%AGIT_AUCTION_BID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid()));
html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
html.replace("%AGIT_AUCTION_END%", String.valueOf(format.format(a.getEndDate())));
html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_selectedItems");
html.replace("npc_%objectId%_bid1", "npc_" + getObjectId() + "_bid1 " + a.getId());
}

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2BlockInstance.java
View File

@@ -61,7 +61,7 @@ public class L2BlockInstance extends L2MonsterInstance
// Change color
_colorEffect = 0x00;
// BroadCast to all known players
this.broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker));
broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker));
increaseTeamPointsAndSend(attacker, team, event);
}
else
@@ -69,7 +69,7 @@ public class L2BlockInstance extends L2MonsterInstance
// Change color
_colorEffect = 0x53;
// BroadCast to all known players
this.broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker));
broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker));
increaseTeamPointsAndSend(attacker, team, event);
}
// 30% chance to drop the event items

72
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClanHallManagerInstance.java
View File

@@ -334,9 +334,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
break;
}
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Provides additional HP recovery for clan members in the clan hall.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
html.replace("%apply%", "recovery hp " + String.valueOf(percent));
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%use%", "Provides additional HP recovery for clan members in the clan hall.<font color=\"00FFFF\">" + percent + "%</font>");
html.replace("%apply%", "recovery hp " + percent);
sendHtmlMessage(player, html);
return;
}
@@ -366,9 +366,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
cost = Config.CH_MPREG5_FEE;
break;
}
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Provides additional MP recovery for clan members in the clan hall.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
html.replace("%apply%", "recovery mp " + String.valueOf(percent));
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%use%", "Provides additional MP recovery for clan members in the clan hall.<font color=\"00FFFF\">" + percent + "%</font>");
html.replace("%apply%", "recovery mp " + percent);
sendHtmlMessage(player, html);
return;
}
@@ -404,9 +404,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
cost = Config.CH_EXPREG7_FEE;
break;
}
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the clan hall.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
html.replace("%apply%", "recovery exp " + String.valueOf(percent));
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the clan hall.<font color=\"00FFFF\">" + percent + "%</font>");
html.replace("%apply%", "recovery exp " + percent);
sendHtmlMessage(player, html);
return;
}
@@ -427,7 +427,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", String.valueOf(val) + "%");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
}
@@ -509,7 +509,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", String.valueOf(val) + "%");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
}
@@ -567,7 +567,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", String.valueOf(val) + "%");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
}
@@ -631,7 +631,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
final String mp_grade3 = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 5\">5%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 15\">15%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 30\">30%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>]";
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null)
{
html.replace("%hp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%hp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLease() + "</font>Adena /" + Config.CH_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getEndTime()));
final int grade = getClanHall().getGrade();
switch (grade)
@@ -673,7 +673,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null)
{
html.replace("%exp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%exp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLease() + "</font>Adena /" + Config.CH_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getEndTime()));
final int grade = getClanHall().getGrade();
switch (grade)
@@ -715,7 +715,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null)
{
html.replace("%mp_recovery%", String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%mp_recovery%", getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLease() + "</font>Adena /" + Config.CH_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getEndTime()));
final int grade = getClanHall().getGrade();
switch (grade)
@@ -811,9 +811,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
cost = Config.CH_ITEM3_FEE;
break;
}
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%use%", "Allow the purchase of special items at fixed intervals.");
html.replace("%apply%", "other item " + String.valueOf(stage));
html.replace("%apply%", "other item " + stage);
sendHtmlMessage(player, html);
return;
}
@@ -852,9 +852,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
cost = Config.CH_SUPPORT8_FEE;
break;
}
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%use%", "Enables the use of supplementary magic.");
html.replace("%apply%", "other support " + String.valueOf(stage));
html.replace("%apply%", "other support " + stage);
sendHtmlMessage(player, html);
return;
}
@@ -875,9 +875,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
cost = Config.CH_TELE2_FEE;
break;
}
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Teleports clan members in a clan hall to the target <font color=\"00FFFF\">Stage " + String.valueOf(stage) + "</font> staging area");
html.replace("%apply%", "other tele " + String.valueOf(stage));
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%use%", "Teleports clan members in a clan hall to the target <font color=\"00FFFF\">Stage " + stage + "</font> staging area");
html.replace("%apply%", "other tele " + stage);
sendHtmlMessage(player, html);
return;
}
@@ -902,7 +902,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", "Stage " + String.valueOf(val));
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
}
@@ -955,7 +955,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", "Stage " + String.valueOf(val));
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
}
@@ -1004,7 +1004,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", "Stage " + String.valueOf(val));
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
}
@@ -1065,7 +1065,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
final String item = "[<a action=\"bypass -h npc_%objectId%_manage other edit_item 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 2\">Level 2</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_item 3\">Level 3</a>]";
if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null)
{
html.replace("%tele%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%tele%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLease() + "</font>Adena /" + Config.CH_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getEndTime()));
html.replace("%change_tele%", "[<a action=\"bypass -h npc_%objectId%_manage other tele_cancel\">Deactivate</a>]" + tele);
}
@@ -1077,7 +1077,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) != null)
{
html.replace("%support%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%support%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLease() + "</font>Adena /" + Config.CH_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getEndTime()));
final int grade = getClanHall().getGrade();
switch (grade)
@@ -1119,7 +1119,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) != null)
{
html.replace("%item%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%item%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLease() + "</font>Adena /" + Config.CH_ITEM_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%item_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getEndTime()));
html.replace("%change_item%", "[<a action=\"bypass -h npc_%objectId%_manage other item_cancel\">Deactivate</a>]" + item);
}
@@ -1174,9 +1174,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
cost = Config.CH_CURTAIN2_FEE;
break;
}
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%use%", "These curtains can be used to decorate the clan hall.");
html.replace("%apply%", "deco curtains " + String.valueOf(stage));
html.replace("%apply%", "deco curtains " + stage);
sendHtmlMessage(player, html);
return;
}
@@ -1197,9 +1197,9 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
cost = Config.CH_FRONT2_FEE;
break;
}
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%use%", "Used to decorate the clan hall.");
html.replace("%apply%", "deco fixtures " + String.valueOf(stage));
html.replace("%apply%", "deco fixtures " + stage);
sendHtmlMessage(player, html);
return;
}
@@ -1220,7 +1220,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", "Stage " + String.valueOf(val));
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
}
@@ -1269,7 +1269,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/clanHallManager/functions-used.htm");
html.replace("%val%", "Stage " + String.valueOf(val));
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
}
@@ -1308,7 +1308,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
final String fixtures = "[<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage deco edit_fixtures 2\">Level 2</a>]";
if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null)
{
html.replace("%curtain%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%curtain%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLease() + "</font>Adena /" + Config.CH_CURTAIN_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%curtain_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getEndTime()));
html.replace("%change_curtain%", "[<a action=\"bypass -h npc_%objectId%_manage deco curtains_cancel\">Deactivate</a>]" + curtains);
}
@@ -1320,7 +1320,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
}
if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) != null)
{
html.replace("%fixture%", "Stage " + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLease()) + "</font>Adena /" + String.valueOf(Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%fixture%", "Stage " + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() + "</font> (<font color=\"FFAABB\">" + getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLease() + "</font>Adena /" + Config.CH_FRONT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%fixture_period%", "Withdraw the fee for the next time at " + format.format(getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getEndTime()));
html.replace("%change_fixture%", "[<a action=\"bypass -h npc_%objectId%_manage deco fixtures_cancel\">Deactivate</a>]" + fixtures);
}

18
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2ClassMasterInstance.java
View File

@@ -133,7 +133,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
}
}
public static final void onTutorialLink(L2PcInstance player, String request)
public static void onTutorialLink(L2PcInstance player, String request)
{
if (!Config.ALTERNATE_CLASS_MASTER || (request == null) || !request.startsWith("CO"))
{
@@ -156,7 +156,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
player.sendPacket(TutorialCloseHtml.STATIC_PACKET);
}
public static final void onTutorialQuestionMark(L2PcInstance player, int number)
public static void onTutorialQuestionMark(L2PcInstance player, int number)
{
if (!Config.ALTERNATE_CLASS_MASTER || (number != 1001))
{
@@ -166,7 +166,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
showTutorialHtml(player);
}
public static final void showQuestionMark(L2PcInstance player)
public static void showQuestionMark(L2PcInstance player)
{
if (!Config.ALTERNATE_CLASS_MASTER)
{
@@ -187,7 +187,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
player.sendPacket(new TutorialShowQuestionMark(1001));
}
private static final void showHtmlMenu(L2PcInstance player, int objectId, int level)
private static void showHtmlMenu(L2PcInstance player, int objectId, int level)
{
final NpcHtmlMessage html = new NpcHtmlMessage(objectId);
@@ -308,7 +308,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
player.sendPacket(html);
}
private static final void showTutorialHtml(L2PcInstance player)
private static void showTutorialHtml(L2PcInstance player)
{
final ClassId currentClassId = player.getClassId();
if ((getMinLevel(currentClassId.level()) > player.getLevel()) && !Config.ALLOW_ENTIRE_TREE)
@@ -337,7 +337,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
player.sendPacket(new TutorialShowHtml(msg));
}
private static final boolean checkAndChangeClass(L2PcInstance player, int val)
private static boolean checkAndChangeClass(L2PcInstance player, int val)
{
final ClassId currentClassId = player.getClassId();
if ((getMinLevel(currentClassId.level()) > player.getLevel()) && !Config.ALLOW_ENTIRE_TREE)
@@ -409,7 +409,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
* @param level - current skillId level (0 - start, 1 - first, etc)
* @return minimum player level required for next class transfer
*/
private static final int getMinLevel(int level)
private static int getMinLevel(int level)
{
switch (level)
{
@@ -430,7 +430,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
* @param val new class index
* @return
*/
private static final boolean validateClassId(ClassId oldCID, int val)
private static boolean validateClassId(ClassId oldCID, int val)
{
return validateClassId(oldCID, ClassId.getClassId(val));
}
@@ -441,7 +441,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
* @param newCID new ClassId
* @return true if class change is possible
*/
private static final boolean validateClassId(ClassId oldCID, ClassId newCID)
private static boolean validateClassId(ClassId oldCID, ClassId newCID)
{
if ((newCID == null) || (newCID.getRace() == null))
{

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FestivalGuideInstance.java
View File

@@ -204,7 +204,7 @@ public final class L2FestivalGuideInstance extends L2Npc
player.sendPacket(ActionFailed.STATIC_PACKET);
}
private static final String getStatsTable()
private static String getStatsTable()
{
final StringBuilder tableHtml = new StringBuilder(1000);
@@ -225,13 +225,13 @@ public final class L2FestivalGuideInstance extends L2Npc
winningCabal = "None";
}
tableHtml.append("<tr><td width=\"100\" align=\"center\">" + festivalName + "</td><td align=\"center\" width=\"35\">" + String.valueOf(duskScore) + "</td><td align=\"center\" width=\"35\">" + String.valueOf(dawnScore) + "</td><td align=\"center\" width=\"130\">" + winningCabal + "</td></tr>");
tableHtml.append("<tr><td width=\"100\" align=\"center\">" + festivalName + "</td><td align=\"center\" width=\"35\">" + duskScore + "</td><td align=\"center\" width=\"35\">" + dawnScore + "</td><td align=\"center\" width=\"130\">" + winningCabal + "</td></tr>");
}
return tableHtml.toString();
}
private static final String getBonusTable()
private static String getBonusTable()
{
final StringBuilder tableHtml = new StringBuilder(500);
@@ -241,7 +241,7 @@ public final class L2FestivalGuideInstance extends L2Npc
final int accumScore = SevenSignsFestival.getInstance().getAccumulatedBonus(i);
final String festivalName = SevenSignsFestival.getFestivalName(i);
tableHtml.append("<tr><td align=\"center\" width=\"150\">" + festivalName + "</td><td align=\"center\" width=\"150\">" + String.valueOf(accumScore) + "</td></tr>");
tableHtml.append("<tr><td align=\"center\" width=\"150\">" + festivalName + "</td><td align=\"center\" width=\"150\">" + accumScore + "</td></tr>");
}
return tableHtml.toString();

50
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2FortManagerInstance.java
View File

@@ -414,9 +414,9 @@ public class L2FortManagerInstance extends L2MerchantInstance
break;
}
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Provides additional HP recovery for clan members in the fortress.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
html.replace("%apply%", "recovery hp " + String.valueOf(percent));
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%use%", "Provides additional HP recovery for clan members in the fortress.<font color=\"00FFFF\">" + percent + "%</font>");
html.replace("%apply%", "recovery hp " + percent);
sendHtmlMessage(player, html);
return;
}
@@ -437,9 +437,9 @@ public class L2FortManagerInstance extends L2MerchantInstance
cost = Config.FS_MPREG2_FEE;
break;
}
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Provides additional MP recovery for clan members in the fortress.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
html.replace("%apply%", "recovery mp " + String.valueOf(percent));
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%use%", "Provides additional MP recovery for clan members in the fortress.<font color=\"00FFFF\">" + percent + "%</font>");
html.replace("%apply%", "recovery mp " + percent);
sendHtmlMessage(player, html);
return;
}
@@ -460,9 +460,9 @@ public class L2FortManagerInstance extends L2MerchantInstance
cost = Config.FS_EXPREG2_FEE;
break;
}
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the fortress.<font color=\"00FFFF\">" + String.valueOf(percent) + "%</font>");
html.replace("%apply%", "recovery exp " + String.valueOf(percent));
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%use%", "Restores the Exp of any clan member who is resurrected in the fortress.<font color=\"00FFFF\">" + percent + "%</font>");
html.replace("%apply%", "recovery exp " + percent);
sendHtmlMessage(player, html);
return;
}
@@ -483,7 +483,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.replace("%val%", String.valueOf(val) + "%");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
}
@@ -528,7 +528,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.replace("%val%", String.valueOf(val) + "%");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
}
@@ -573,7 +573,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.replace("%val%", String.valueOf(val) + "%");
html.replace("%val%", val + "%");
sendHtmlMessage(player, html);
return;
}
@@ -609,7 +609,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
final String mp = "[<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 40\">40%</a>][<a action=\"bypass -h npc_%objectId%_manage recovery edit_mp 50\">50%</a>]";
if (getFort().getFunction(Fort.FUNC_RESTORE_HP) != null)
{
html.replace("%hp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%hp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_RESTORE_HP).getLease() + "</font>Adena /" + Config.FS_HPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%hp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_HP).getEndTime()));
html.replace("%change_hp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery hp_cancel\">Deactivate</a>]" + hp);
}
@@ -621,7 +621,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (getFort().getFunction(Fort.FUNC_RESTORE_EXP) != null)
{
html.replace("%exp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%exp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLease() + "</font>Adena /" + Config.FS_EXPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%exp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_EXP).getEndTime()));
html.replace("%change_exp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery exp_cancel\">Deactivate</a>]" + exp);
}
@@ -633,7 +633,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (getFort().getFunction(Fort.FUNC_RESTORE_MP) != null)
{
html.replace("%mp_recovery%", String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl()) + "%</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_RESTORE_MP).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%mp_recovery%", getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() + "%</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_RESTORE_MP).getLease() + "</font>Adena /" + Config.FS_MPREG_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%mp_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_RESTORE_MP).getEndTime()));
html.replace("%change_mp%", "[<a action=\"bypass -h npc_%objectId%_manage recovery mp_cancel\">Deactivate</a>]" + mp);
}
@@ -688,9 +688,9 @@ public class L2FortManagerInstance extends L2MerchantInstance
cost = Config.FS_SUPPORT2_FEE;
break;
}
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%use%", "Enables the use of supplementary magic.");
html.replace("%apply%", "other support " + String.valueOf(stage));
html.replace("%apply%", "other support " + stage);
sendHtmlMessage(player, html);
return;
}
@@ -711,9 +711,9 @@ public class L2FortManagerInstance extends L2MerchantInstance
cost = Config.FS_TELE2_FEE;
break;
}
html.replace("%cost%", String.valueOf(cost) + "</font>Adena /" + String.valueOf(Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day</font>)");
html.replace("%use%", "Teleports clan members in a fort to the target <font color=\"00FFFF\">Stage " + String.valueOf(stage) + "</font> staging area");
html.replace("%apply%", "other tele " + String.valueOf(stage));
html.replace("%cost%", cost + "</font>Adena /" + Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day</font>)");
html.replace("%use%", "Teleports clan members in a fort to the target <font color=\"00FFFF\">Stage " + stage + "</font> staging area");
html.replace("%apply%", "other tele " + stage);
sendHtmlMessage(player, html);
return;
}
@@ -734,7 +734,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.replace("%val%", "Stage " + String.valueOf(val));
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
}
@@ -779,7 +779,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
if (getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
{
html.setFile(player.getHtmlPrefix(), "data/html/fortress/functions-used.htm");
html.replace("%val%", "Stage " + String.valueOf(val));
html.replace("%val%", "Stage " + val);
sendHtmlMessage(player, html);
return;
}
@@ -817,7 +817,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
final String support = "[<a action=\"bypass -h npc_%objectId%_manage other edit_support 1\">Level 1</a>][<a action=\"bypass -h npc_%objectId%_manage other edit_support 2\">Level 2</a>]";
if (getFort().getFunction(Fort.FUNC_TELEPORT) != null)
{
html.replace("%tele%", "Stage " + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_TELEPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%tele%", "Stage " + getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_TELEPORT).getLease() + "</font>Adena /" + Config.FS_TELE_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%tele_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_TELEPORT).getEndTime()));
html.replace("%change_tele%", "[<a action=\"bypass -h npc_%objectId%_manage other tele_cancel\">Deactivate</a>]" + tele);
}
@@ -829,7 +829,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
}
if (getFort().getFunction(Fort.FUNC_SUPPORT) != null)
{
html.replace("%support%", "Stage " + String.valueOf(getFort().getFunction(Fort.FUNC_SUPPORT).getLvl()) + "</font> (<font color=\"FFAABB\">" + String.valueOf(getFort().getFunction(Fort.FUNC_SUPPORT).getLease()) + "</font>Adena /" + String.valueOf(Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24) + " Day)");
html.replace("%support%", "Stage " + getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() + "</font> (<font color=\"FFAABB\">" + getFort().getFunction(Fort.FUNC_SUPPORT).getLease() + "</font>Adena /" + Config.FS_SUPPORT_FEE_RATIO / 1000 / 60 / 60 / 24 + " Day)");
html.replace("%support_period%", "Withdraw the fee for the next time at " + format.format(getFort().getFunction(Fort.FUNC_SUPPORT).getEndTime()));
html.replace("%change_support%", "[<a action=\"bypass -h npc_%objectId%_manage other support_cancel\">Deactivate</a>]" + support);
}
@@ -897,7 +897,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
{
if (!((skill.getMpConsume() + skill.getMpInitialConsume()) > getCurrentMp()))
{
this.doCast(skill);
doCast(skill);
}
else
{

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2StaticObjectInstance.java
View File

@@ -176,7 +176,7 @@ public final class L2StaticObjectInstance extends L2Character
public void setMeshIndex(int meshIndex)
{
_meshIndex = meshIndex;
this.broadcastPacket(new StaticObject(this));
broadcastPacket(new StaticObject(this));
}
/**

22
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/instance/L2VillageMasterInstance.java
View File

@@ -376,7 +376,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
final StringBuilder content1 = new StringBuilder(200);
for (PlayerClass subClass : subsAvailable)
{
content1.append("<a action=\"bypass -h npc_%objectId%_Subclass 4 " + String.valueOf(subClass.ordinal()) + "\" msg=\"1268;" + ClassListData.getInstance().getClass(subClass.ordinal()).getClassName() + "\">" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "</a><br>");
content1.append("<a action=\"bypass -h npc_%objectId%_Subclass 4 " + subClass.ordinal() + "\" msg=\"1268;" + ClassListData.getInstance().getClass(subClass.ordinal()).getClassName() + "\">" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "</a><br>");
}
html.replace("%list%", content1.toString());
}
@@ -418,7 +418,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
final SubClass subClass = subList.next();
if (checkVillageMaster(subClass.getClassDefinition()))
{
content2.append("<a action=\"bypass -h npc_%objectId%_Subclass 5 " + String.valueOf(subClass.getClassIndex()) + "\">" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "</a><br>");
content2.append("<a action=\"bypass -h npc_%objectId%_Subclass 5 " + subClass.getClassIndex() + "\">" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "</a><br>");
}
}
@@ -451,7 +451,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
{
final SubClass subClass = subList.next();
content3.append("Sub-class " + String.valueOf(classIndex++) + "<br><a action=\"bypass -h npc_%objectId%_Subclass 6 " + String.valueOf(subClass.getClassIndex()) + "\">" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "</a><br>");
content3.append("Sub-class " + classIndex++ + "<br><a action=\"bypass -h npc_%objectId%_Subclass 6 " + subClass.getClassIndex() + "\">" + ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode() + "</a><br>");
}
html.replace("%list%", content3.toString());
}
@@ -613,7 +613,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
final StringBuilder content6 = new StringBuilder(200);
for (PlayerClass subClass : subsAvailable)
{
content6.append("<a action=\"bypass -h npc_%objectId%_Subclass 7 " + String.valueOf(paramOne) + " " + String.valueOf(subClass.ordinal()) + "\" msg=\"1445;\">" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "</a><br>");
content6.append("<a action=\"bypass -h npc_%objectId%_Subclass 7 " + paramOne + " " + subClass.ordinal() + "\" msg=\"1445;\">" + ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode() + "</a><br>");
}
switch (paramOne)
@@ -879,12 +879,12 @@ public class L2VillageMasterInstance extends L2NpcInstance
return checkVillageMasterRace(pclass) && checkVillageMasterTeachType(pclass);
}
private static final Iterator<SubClass> iterSubClasses(L2PcInstance player)
private static Iterator<SubClass> iterSubClasses(L2PcInstance player)
{
return player.getSubClasses().values().iterator();
}
private static final void dissolveClan(L2PcInstance player, int clanId)
private static void dissolveClan(L2PcInstance player, int clanId)
{
if (!player.isClanLeader())
{
@@ -945,7 +945,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
ClanTable.getInstance().scheduleRemoveClan(clan.getId());
}
private static final void recoverClan(L2PcInstance player, int clanId)
private static void recoverClan(L2PcInstance player, int clanId)
{
if (!player.isClanLeader())
{
@@ -958,7 +958,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
clan.updateClanInDB();
}
private static final void createSubPledge(L2PcInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl)
private static void createSubPledge(L2PcInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl)
{
if (!player.isClanLeader())
{
@@ -1069,7 +1069,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
}
}
private static final void renameSubPledge(L2PcInstance player, int pledgeType, String pledgeName)
private static void renameSubPledge(L2PcInstance player, int pledgeType, String pledgeName)
{
if (!player.isClanLeader())
{
@@ -1102,7 +1102,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
player.sendMessage("Pledge name changed.");
}
private static final void assignSubPledgeLeader(L2PcInstance player, String clanName, String leaderName)
private static void assignSubPledgeLeader(L2PcInstance player, String clanName, String leaderName)
{
if (!player.isClanLeader())
{
@@ -1165,7 +1165,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
* this displays PledgeSkillList to the player.
* @param player
*/
public static final void showPledgeSkillList(L2PcInstance player)
public static void showPledgeSkillList(L2PcInstance player)
{
if (!player.isClanLeader())
{

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/base/PlayerClass.java
View File

@@ -299,7 +299,7 @@ public enum PlayerClass
return subclasses;
}
public static final EnumSet<PlayerClass> getSet(Race race, ClassLevel level)
public static EnumSet<PlayerClass> getSet(Race race, ClassLevel level)
{
final EnumSet<PlayerClass> allOf = EnumSet.noneOf(PlayerClass.class);

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/drops/IDropItem.java
View File

@@ -32,5 +32,5 @@ public interface IDropItem
* @param killer the killer
* @return {@code null} or empty collection if there are no drops, a collection containing all items to drop otherwise
*/
public Collection<ItemHolder> calculateDrops(L2Character victim, L2Character killer);
Collection<ItemHolder> calculateDrops(L2Character victim, L2Character killer);
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/FortSiege.java
View File

@@ -170,7 +170,7 @@ public class FortSiege implements Siegable
}
else
{
_log.warning("Exception: ScheduleStartSiegeTask(): unknown siege time: " + String.valueOf(_time));
_log.warning("Exception: ScheduleStartSiegeTask(): unknown siege time: " + _time);
}
}
catch (Exception e)

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
View File

@@ -411,7 +411,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
{
cancelSiegeTask();
_siegeTask = ThreadPoolManager.schedule(new PrepareOwner(), _hall.getNextSiegeTime() - 3600000);
_log.config(_hall.getName() + " siege scheduled for " + _hall.getSiegeDate().getTime().toString() + ".");
_log.config(_hall.getName() + " siege scheduled for " + _hall.getSiegeDate().getTime() + ".");
}
public void cancelSiegeTask()

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java
View File

@@ -400,7 +400,7 @@ public final class ItemAuctionInstance
{
if (!_auction.setAuctionState(state, ItemAuctionState.STARTED))
{
throw new IllegalStateException("Could not set auction state: " + ItemAuctionState.STARTED.toString() + ", expected: " + state.toString());
throw new IllegalStateException("Could not set auction state: " + ItemAuctionState.STARTED + ", expected: " + state);
}
_log.log(Level.INFO, getClass().getSimpleName() + ": Auction " + _auction.getAuctionId() + " has started for instance " + _auction.getInstanceId());
@@ -454,7 +454,7 @@ public final class ItemAuctionInstance
if (!_auction.setAuctionState(state, ItemAuctionState.FINISHED))
{
throw new IllegalStateException("Could not set auction state: " + ItemAuctionState.FINISHED.toString() + ", expected: " + state.toString());
throw new IllegalStateException("Could not set auction state: " + ItemAuctionState.FINISHED + ", expected: " + state);
}
onAuctionFinished(_auction);

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -53,9 +53,9 @@ public abstract class Inventory extends ItemContainer
public interface PaperdollListener
{
public void notifyEquiped(int slot, L2ItemInstance inst, Inventory inventory);
void notifyEquiped(int slot, L2ItemInstance inst, Inventory inventory);
public void notifyUnequiped(int slot, L2ItemInstance inst, Inventory inventory);
void notifyUnequiped(int slot, L2ItemInstance inst, Inventory inventory);
}
// Common Items

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1140,7 +1140,7 @@ public final class Skill implements IIdentifiable
* @param sourceInArena
* @return
*/
public static final boolean checkForAreaOffensiveSkills(L2Character caster, L2Character target, Skill skill, boolean sourceInArena)
public static boolean checkForAreaOffensiveSkills(L2Character caster, L2Character target, Skill skill, boolean sourceInArena)
{
if ((target == null) || target.isDead() || (target == caster))
{
@@ -1228,7 +1228,7 @@ public final class Skill implements IIdentifiable
return true;
}
public static final boolean addSummon(L2Character caster, L2PcInstance owner, int radius, boolean isDead)
public static boolean addSummon(L2Character caster, L2PcInstance owner, int radius, boolean isDead)
{
if (!owner.hasSummon())
{
@@ -1237,7 +1237,7 @@ public final class Skill implements IIdentifiable
return addCharacter(caster, owner.getSummon(), radius, isDead);
}
public static final boolean addCharacter(L2Character caster, L2Character target, int radius, boolean isDead)
public static boolean addCharacter(L2Character caster, L2Character target, int radius, boolean isDead)
{
if (isDead != target.isDead())
{

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
View File

@@ -76,7 +76,7 @@ public enum BaseStats
return 1;
}
public static final BaseStats valueOfXml(String name)
public static BaseStats valueOfXml(String name)
{
name = name.intern();
for (BaseStats s : values())
@@ -91,7 +91,7 @@ public enum BaseStats
private interface BaseStat
{
public double calcBonus(L2Character actor);
double calcBonus(L2Character actor);
}
protected static final class STR implements BaseStat

28
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -247,7 +247,7 @@ public final class Formulas
* @param cha
* @return
*/
public static final double calcHpRegen(L2Character cha)
public static double calcHpRegen(L2Character cha)
{
double init = cha.isPlayer() ? cha.getActingPlayer().getTemplate().getBaseHpRegen(cha.getLevel()) : cha.getTemplate().getBaseHpReg();
double hpRegenMultiplier = cha.isRaid() ? Config.RAID_HP_REGEN_MULTIPLIER : Config.HP_REGEN_MULTIPLIER;
@@ -368,7 +368,7 @@ public final class Formulas
* @param cha
* @return
*/
public static final double calcMpRegen(L2Character cha)
public static double calcMpRegen(L2Character cha)
{
double init = cha.isPlayer() ? cha.getActingPlayer().getTemplate().getBaseMpRegen(cha.getLevel()) : cha.getTemplate().getBaseMpReg();
double mpRegenMultiplier = cha.isRaid() ? Config.RAID_MP_REGEN_MULTIPLIER : Config.MP_REGEN_MULTIPLIER;
@@ -476,7 +476,7 @@ public final class Formulas
* @param player the player
* @return the CP regeneration rate
*/
public static final double calcCpRegen(L2PcInstance player)
public static double calcCpRegen(L2PcInstance player)
{
// With CON bonus
final double init = player.getActingPlayer().getTemplate().getBaseCpRegen(player.getLevel()) * player.getLevelMod() * BaseStats.CON.calcBonus(player);
@@ -496,7 +496,7 @@ public final class Formulas
return player.calcStat(Stats.REGENERATE_CP_RATE, Math.max(1, init), null, null) * cpRegenMultiplier;
}
public static final double calcFestivalRegenModifier(L2PcInstance activeChar)
public static double calcFestivalRegenModifier(L2PcInstance activeChar)
{
final int[] festivalInfo = SevenSignsFestival.getInstance().getFestivalForPlayer(activeChar);
final int oracle = festivalInfo[0];
@@ -530,7 +530,7 @@ public final class Formulas
return 1.0 - (distToCenter * 0.0005); // Maximum Decreased Regen of ~ -65%;
}
public static final double calcSiegeRegenModifier(L2PcInstance activeChar)
public static double calcSiegeRegenModifier(L2PcInstance activeChar)
{
if ((activeChar == null) || (activeChar.getClan() == null))
{
@@ -744,7 +744,7 @@ public final class Formulas
* @param ss if weapon item was charged by soulshot
* @return
*/
public static final double calcPhysDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean crit, boolean ss)
public static double calcPhysDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean crit, boolean ss)
{
final boolean isPvP = attacker.isPlayable() && target.isPlayable();
final boolean isPvE = attacker.isPlayable() && target.isAttackable();
@@ -890,7 +890,7 @@ public final class Formulas
return damage;
}
public static final double calcMagicDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean sps, boolean bss, boolean mcrit)
public static double calcMagicDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean sps, boolean bss, boolean mcrit)
{
double mDef = target.getMDef(attacker, skill);
switch (shld)
@@ -999,7 +999,7 @@ public final class Formulas
return damage;
}
public static final double calcMagicDam(L2CubicInstance attacker, L2Character target, Skill skill, boolean mcrit, byte shld)
public static double calcMagicDam(L2CubicInstance attacker, L2Character target, Skill skill, boolean mcrit, byte shld)
{
double mDef = target.getMDef(attacker.getOwner(), skill);
switch (shld)
@@ -1085,7 +1085,7 @@ public final class Formulas
return damage;
}
public static final boolean calcCrit(L2Character attacker, L2Character target)
public static boolean calcCrit(L2Character attacker, L2Character target)
{
return calcCrit(attacker, target, null);
}
@@ -1097,7 +1097,7 @@ public final class Formulas
* @param skill
* @return
*/
public static final boolean calcCrit(L2Character attacker, L2Character target, Skill skill)
public static boolean calcCrit(L2Character attacker, L2Character target, Skill skill)
{
double rate = 0.d;
if (skill != null)
@@ -1111,7 +1111,7 @@ public final class Formulas
return (target.getStat().calcStat(Stats.DEFENCE_CRITICAL_RATE, rate, null, null) + target.getStat().calcStat(Stats.DEFENCE_CRITICAL_RATE_ADD, 0, null, null)) > Rnd.get(1000);
}
public static final boolean calcMCrit(double mRate)
public static boolean calcMCrit(double mRate)
{
return mRate > Rnd.get(1000);
}
@@ -1121,7 +1121,7 @@ public final class Formulas
* @param dmg
* @return true in case when ATTACK is canceled due to hit
*/
public static final boolean calcAtkBreak(L2Character target, double dmg)
public static boolean calcAtkBreak(L2Character target, double dmg)
{
if (target.isChanneling())
{
@@ -1170,7 +1170,7 @@ public final class Formulas
* @param rate
* @return
*/
public static final int calcPAtkSpd(L2Character attacker, L2Character target, double rate)
public static int calcPAtkSpd(L2Character attacker, L2Character target, double rate)
{
// measured Oct 2006 by Tank6585, formula by Sami
// attack speed 312 equals 1500 ms delay... (or 300 + 40 ms delay?)
@@ -1188,7 +1188,7 @@ public final class Formulas
* @param skillTime
* @return
*/
public static final int calcAtkSpd(L2Character attacker, Skill skill, double skillTime)
public static int calcAtkSpd(L2Character attacker, Skill skill, double skillTime)
{
if (skill.isMagic())
{

12
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/L2GamePacketHandler.java
View File

@@ -105,7 +105,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
{
if (Config.PACKET_HANDLER_DEBUG)
{
_log.warning("Client: " + client.toString() + " sent a 0xd0 without the second opcode.");
_log.warning("Client: " + client + " sent a 0xd0 without the second opcode.");
}
break;
}
@@ -330,7 +330,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
{
if (Config.PACKET_HANDLER_DEBUG)
{
_log.warning("Client: " + client.toString() + " sent a 0x4a without the second opcode.");
_log.warning("Client: " + client + " sent a 0x4a without the second opcode.");
}
break;
}
@@ -703,7 +703,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
{
if (Config.PACKET_HANDLER_DEBUG)
{
_log.warning("Client: " + client.toString() + " sent a 0xd0 without the second opcode.");
_log.warning("Client: " + client + " sent a 0xd0 without the second opcode.");
}
break;
}
@@ -961,7 +961,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
}
else
{
_log.warning("Client: " + client.toString() + " sent a 0xd0:0x51 without the third opcode.");
_log.warning("Client: " + client + " sent a 0xd0:0x51 without the third opcode.");
break;
}
switch (id3)
@@ -1168,7 +1168,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
}
final int size = buf.remaining();
_log.warning("Unknown Packet: 0x" + Integer.toHexString(opcode) + " on State: " + state.name() + " Client: " + client.toString());
_log.warning("Unknown Packet: 0x" + Integer.toHexString(opcode) + " on State: " + state.name() + " Client: " + client);
final byte[] array = new byte[size];
buf.get(array);
_log.warning(Util.printData(array, size));
@@ -1183,7 +1183,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
}
final int size = buf.remaining();
_log.warning("Unknown Packet: 0x" + Integer.toHexString(opcode) + ":0x" + Integer.toHexString(id2) + " on State: " + state.name() + " Client: " + client.toString());
_log.warning("Unknown Packet: 0x" + Integer.toHexString(opcode) + ":0x" + Integer.toHexString(id2) + " on State: " + state.name() + " Client: " + client);
final byte[] array = new byte[size];
buf.get(array);
_log.warning(Util.printData(array, size));

14
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/AbstractRefinePacket.java
View File

@@ -194,7 +194,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
_lifeStones.put(16178, new LifeStone(GRADE_ACC, 13));
}
protected static final LifeStone getLifeStone(int itemId)
protected static LifeStone getLifeStone(int itemId)
{
return _lifeStones.get(itemId);
}
@@ -207,7 +207,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
* @param gemStones
* @return
*/
protected static final boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem, L2ItemInstance gemStones)
protected static boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem, L2ItemInstance gemStones)
{
if (!isValid(player, item, refinerItem))
{
@@ -249,7 +249,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
* @param refinerItem
* @return
*/
protected static final boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem)
protected static boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem)
{
if (!isValid(player, item))
{
@@ -297,7 +297,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
* @param item
* @return
*/
protected static final boolean isValid(L2PcInstance player, L2ItemInstance item)
protected static boolean isValid(L2PcInstance player, L2ItemInstance item)
{
if (!isValid(player))
{
@@ -395,7 +395,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
* @param player
* @return
*/
protected static final boolean isValid(L2PcInstance player)
protected static boolean isValid(L2PcInstance player)
{
if (player.getPrivateStoreType() != PrivateStoreType.NONE)
{
@@ -443,7 +443,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
* @param itemGrade
* @return GemStone itemId based on item grade
*/
protected static final int getGemStoneId(CrystalType itemGrade)
protected static int getGemStoneId(CrystalType itemGrade)
{
switch (itemGrade)
{
@@ -467,7 +467,7 @@ public abstract class AbstractRefinePacket extends L2GameClientPacket
* @param lifeStoneGrade
* @return GemStone count based on item grade and life stone grade
*/
protected static final int getGemStoneCount(CrystalType itemGrade, int lifeStoneGrade)
protected static int getGemStoneCount(CrystalType itemGrade, int lifeStoneGrade)
{
switch (lifeStoneGrade)
{

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/L2GameClientPacket.java
View File

@@ -47,7 +47,7 @@ public abstract class L2GameClientPacket extends ReceivablePacket<L2GameClient>
}
catch (Exception e)
{
_log.log(Level.SEVERE, "Client: " + getClient().toString() + " - Failed reading: " + getType() + " ; " + e.getMessage(), e);
_log.log(Level.SEVERE, "Client: " + getClient() + " - Failed reading: " + getType() + " ; " + e.getMessage(), e);
if (e instanceof BufferUnderflowException)
{
@@ -84,7 +84,7 @@ public abstract class L2GameClientPacket extends ReceivablePacket<L2GameClient>
}
catch (Throwable t)
{
_log.log(Level.SEVERE, "Client: " + getClient().toString() + " - Failed running: " + getType() + " ; " + t.getMessage(), t);
_log.log(Level.SEVERE, "Client: " + getClient() + " - Failed running: " + getType() + " ; " + t.getMessage(), t);
// in case of EnterWorld error kick player from game
if (this instanceof EnterWorld)
{

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
View File

@@ -311,7 +311,7 @@ public final class RequestBypassToServer extends L2GameClientPacket
sb.append("StackTrace:<br1>");
for (StackTraceElement ste : e.getStackTrace())
{
sb.append(ste.toString() + "<br1>");
sb.append(ste + "<br1>");
}
sb.append("</body></html>");
// item html

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@@ -113,7 +113,7 @@ public final class Say2 extends L2GameClientPacket
ChatType chatType = ChatType.findByClientId(_type);
if (chatType == null)
{
_log.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + String.valueOf(_text));
_log.warning("Say2: Invalid type: " + _type + " Player : " + activeChar.getName() + " text: " + _text);
activeChar.sendPacket(ActionFailed.STATIC_PACKET);
activeChar.logout();
return;

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExEnchantSkillResult.java
View File

@@ -24,7 +24,7 @@ public class ExEnchantSkillResult extends L2GameServerPacket
private static final ExEnchantSkillResult STATIC_PACKET_TRUE = new ExEnchantSkillResult(true);
private static final ExEnchantSkillResult STATIC_PACKET_FALSE = new ExEnchantSkillResult(false);
public static final ExEnchantSkillResult valueOf(boolean result)
public static ExEnchantSkillResult valueOf(boolean result)
{
return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE;
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostArrived.java
View File

@@ -24,7 +24,7 @@ public class ExNoticePostArrived extends L2GameServerPacket
private static final ExNoticePostArrived STATIC_PACKET_TRUE = new ExNoticePostArrived(true);
private static final ExNoticePostArrived STATIC_PACKET_FALSE = new ExNoticePostArrived(false);
public static final ExNoticePostArrived valueOf(boolean result)
public static ExNoticePostArrived valueOf(boolean result)
{
return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE;
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/ExNoticePostSent.java
View File

@@ -24,7 +24,7 @@ public class ExNoticePostSent extends L2GameServerPacket
private static final ExNoticePostSent STATIC_PACKET_TRUE = new ExNoticePostSent(true);
private static final ExNoticePostSent STATIC_PACKET_FALSE = new ExNoticePostSent(false);
public static final ExNoticePostSent valueOf(boolean result)
public static ExNoticePostSent valueOf(boolean result)
{
return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE;
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/L2GameServerPacket.java
View File

@@ -106,7 +106,7 @@ public abstract class L2GameServerPacket extends SendablePacket<L2GameClient>
}
catch (Exception e)
{
_log.log(Level.SEVERE, "Client: " + getClient().toString() + " - Failed writing: " + getClass().getSimpleName() + " ; " + e.getMessage(), e);
_log.log(Level.SEVERE, "Client: " + getClient() + " - Failed writing: " + getClass().getSimpleName() + " ; " + e.getMessage(), e);
}
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
View File

@@ -21,7 +21,7 @@ public final class RestartResponse extends L2GameServerPacket
private static final RestartResponse STATIC_PACKET_TRUE = new RestartResponse(true);
private static final RestartResponse STATIC_PACKET_FALSE = new RestartResponse(false);
public static final RestartResponse valueOf(boolean result)
public static RestartResponse valueOf(boolean result)
{
return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE;
}

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
View File

@@ -28,7 +28,7 @@ public final class SystemMessage extends AbstractMessagePacket<SystemMessage>
super(smId);
}
public static final SystemMessage sendString(String text)
public static SystemMessage sendString(String text)
{
if (text == null)
{
@@ -40,7 +40,7 @@ public final class SystemMessage extends AbstractMessagePacket<SystemMessage>
return sm;
}
public static final SystemMessage getSystemMessage(SystemMessageId smId)
public static SystemMessage getSystemMessage(SystemMessageId smId)
{
SystemMessage sm = smId.getStaticSystemMessage();
if (sm != null)

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/scripting/java/JavaExecutionContext.java
View File

@@ -148,7 +148,7 @@ public final class JavaExecutionContext extends AbstractExecutionContext<JavaScr
out.println("----------------");
for (Diagnostic<? extends JavaFileObject> diagnostic : fileManagerDiagnostics.getDiagnostics())
{
out.println("\t" + diagnostic.getKind().toString() + ": " + diagnostic.getSource().getName() + ", Line " + diagnostic.getLineNumber() + ", Column " + diagnostic.getColumnNumber());
out.println("\t" + diagnostic.getKind() + ": " + diagnostic.getSource().getName() + ", Line " + diagnostic.getLineNumber() + ", Column " + diagnostic.getColumnNumber());
out.println("\t\tcode: " + diagnostic.getCode());
out.println("\t\tmessage: " + diagnostic.getMessage(null));
}
@@ -159,7 +159,7 @@ public final class JavaExecutionContext extends AbstractExecutionContext<JavaScr
out.println("-----------------------");
for (Diagnostic<? extends JavaFileObject> diagnostic : compilationDiagnostics.getDiagnostics())
{
out.println("\t" + diagnostic.getKind().toString() + ": " + diagnostic.getSource().getName() + ", Line " + diagnostic.getLineNumber() + ", Column " + diagnostic.getColumnNumber());
out.println("\t" + diagnostic.getKind() + ": " + diagnostic.getSource().getName() + ", Line " + diagnostic.getLineNumber() + ", Column " + diagnostic.getColumnNumber());
out.println("\t\tcode: " + diagnostic.getCode());
out.println("\t\tmessage: " + diagnostic.getMessage(null));
}

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Evolve.java
View File

@@ -47,7 +47,7 @@ public final class Evolve
{
protected static final Logger _log = Logger.getLogger(Evolve.class.getName());
public static final boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl)
public static boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl)
{
if ((itemIdtake == 0) || (itemIdgive == 0) || (petminlvl == 0))
{

8
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java
View File

@@ -270,7 +270,7 @@ public final class Util
String result = "";
for (T val : array)
{
result += val.toString() + delim;
result += val + delim;
}
if (!result.isEmpty())
{
@@ -442,7 +442,7 @@ public final class Util
if (Config.HTML_ACTION_CACHE_DEBUG)
{
LOGGER.info("Cached html bypass(" + scope.toString() + "): '" + bypass + "'");
LOGGER.info("Cached html bypass(" + scope + "): '" + bypass + "'");
}
player.addHtmlAction(scope, bypass);
bypassStart = htmlLower.indexOf("=\"bypass ", bypassEnd);
@@ -479,7 +479,7 @@ public final class Util
if (Config.HTML_ACTION_CACHE_DEBUG)
{
LOGGER.info("Cached html link(" + scope.toString() + "): '" + htmlLink + "'");
LOGGER.info("Cached html link(" + scope + "): '" + htmlLink + "'");
}
// let's keep an action cache with "link " lowercase literal kept
player.addHtmlAction(scope, "link " + htmlLink);
@@ -505,7 +505,7 @@ public final class Util
if (Config.HTML_ACTION_CACHE_DEBUG)
{
LOGGER.info("Set html action npc(" + scope.toString() + "): " + npcObjId);
LOGGER.info("Set html action npc(" + scope + "): " + npcObjId);
}
player.setHtmlActionOriginObjectId(scope, npcObjId);
buildHtmlBypassCache(player, scope, html);

4
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/util/IPSubnet.java
View File

@@ -54,7 +54,7 @@ public class IPSubnet
_mask = getMask(mask, _addr.length);
if (!applyMask(_addr))
{
throw new UnknownHostException(addr.toString() + "/" + mask);
throw new UnknownHostException(addr + "/" + mask);
}
}
@@ -114,7 +114,7 @@ public class IPSubnet
try
{
return InetAddress.getByAddress(_addr).toString() + "/" + size;
return InetAddress.getByAddress(_addr) + "/" + size;
}
catch (UnknownHostException e)
{