Cleanup of unnecessary void method and class modifiers.
This commit is contained in:
+1
-1
@@ -770,7 +770,7 @@ public class Antharas extends AbstractNpcAI
|
||||
GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime);
|
||||
}
|
||||
|
||||
private final void refreshAiParams(Player attacker, int damage)
|
||||
private void refreshAiParams(Player attacker, int damage)
|
||||
{
|
||||
if ((attacker_1 != null) && (attacker == attacker_1))
|
||||
{
|
||||
|
||||
+2
-2
@@ -616,12 +616,12 @@ public class Baium extends AbstractNpcAI
|
||||
return super.unload(removeFromList);
|
||||
}
|
||||
|
||||
private final void refreshAiParams(Creature attacker, Npc npc, int damage)
|
||||
private void refreshAiParams(Creature attacker, Npc npc, int damage)
|
||||
{
|
||||
refreshAiParams(attacker, npc, damage, damage);
|
||||
}
|
||||
|
||||
private final void refreshAiParams(Creature attacker, Npc npc, int damage, int aggro)
|
||||
private void refreshAiParams(Creature attacker, Npc npc, int damage, int aggro)
|
||||
{
|
||||
final int newAggroVal = damage + getRandom(3000);
|
||||
final int aggroVal = aggro + 1000;
|
||||
|
||||
Vendored
+1
-1
@@ -169,7 +169,7 @@ public class CastleChamberlain extends AbstractNpcAI
|
||||
return "chamberlain-21.html";
|
||||
}
|
||||
|
||||
private final void funcReplace(Castle castle, NpcHtmlMessage html, int func, String str)
|
||||
private void funcReplace(Castle castle, NpcHtmlMessage html, int func, String str)
|
||||
{
|
||||
final CastleFunction function = castle.getFunction(func);
|
||||
if (function == null)
|
||||
|
||||
@@ -163,7 +163,7 @@ public class VarkaKetra extends AbstractNpcAI
|
||||
}
|
||||
}
|
||||
|
||||
private final void decreaseAlliance(Player player, int[] marks)
|
||||
private void decreaseAlliance(Player player, int[] marks)
|
||||
{
|
||||
for (int i = 0; i < marks.length; i++)
|
||||
{
|
||||
@@ -179,7 +179,7 @@ public class VarkaKetra extends AbstractNpcAI
|
||||
}
|
||||
}
|
||||
|
||||
private final void exitQuests(Player player, String[] quests)
|
||||
private void exitQuests(Player player, String[] quests)
|
||||
{
|
||||
for (String quest : quests)
|
||||
{
|
||||
|
||||
+1
-1
@@ -87,7 +87,7 @@ public class FortressOfResistance extends ClanHallSiegeEngine
|
||||
}
|
||||
}
|
||||
|
||||
private final void buildMessengerMessage()
|
||||
private void buildMessengerMessage()
|
||||
{
|
||||
final String html = HtmCache.getInstance().getHtm(null, "data/scripts/conquerablehalls/FortressOfResistance/partisan_ordery_brakel001.htm");
|
||||
if (html != null)
|
||||
|
||||
+6
-6
@@ -671,7 +671,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
|
||||
saveMember(clanId, clan.getLeaderId());
|
||||
}
|
||||
|
||||
private final void doUnSpawns(ClanData data)
|
||||
private void doUnSpawns(ClanData data)
|
||||
{
|
||||
if (data.flagInstance != null)
|
||||
{
|
||||
@@ -685,7 +685,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
|
||||
}
|
||||
}
|
||||
|
||||
private final void removeParticipant(int clanId, boolean teleport)
|
||||
private void removeParticipant(int clanId, boolean teleport)
|
||||
{
|
||||
final ClanData dat = _data.remove(clanId);
|
||||
if (dat != null)
|
||||
@@ -777,7 +777,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
|
||||
}
|
||||
}
|
||||
|
||||
private final void loadAttackerMembers(int clanId)
|
||||
private void loadAttackerMembers(int clanId)
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection())
|
||||
{
|
||||
@@ -805,7 +805,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
|
||||
}
|
||||
}
|
||||
|
||||
private final void saveClan(int clanId, int flag)
|
||||
private void saveClan(int clanId, int flag)
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection())
|
||||
{
|
||||
@@ -823,7 +823,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
|
||||
}
|
||||
}
|
||||
|
||||
private final void saveNpc(int npc, int clanId)
|
||||
private void saveNpc(int npc, int clanId)
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection())
|
||||
{
|
||||
@@ -839,7 +839,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
|
||||
}
|
||||
}
|
||||
|
||||
private final void saveMember(int clanId, int objectId)
|
||||
private void saveMember(int clanId, int objectId)
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection())
|
||||
{
|
||||
|
||||
Vendored
+1
-1
@@ -1387,7 +1387,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
||||
activeChar.sendPacket(adminReply);
|
||||
}
|
||||
|
||||
private final class IpPack
|
||||
private class IpPack
|
||||
{
|
||||
String ip;
|
||||
int[][] tracert;
|
||||
|
||||
Vendored
+1
-1
@@ -77,7 +77,7 @@ public class AdminHtml implements IAdminCommandHandler
|
||||
* @param activeChar activeChar where html is shown
|
||||
* @param path relative path from directory data/html/admin/ to html
|
||||
*/
|
||||
static void showAdminHtml(Player activeChar, String path)
|
||||
public static void showAdminHtml(Player activeChar, String path)
|
||||
{
|
||||
showHtml(activeChar, "data/html/admin/" + path, false);
|
||||
}
|
||||
|
||||
Vendored
+1
-1
@@ -446,7 +446,7 @@ public class Wedding implements IVoicedCommandHandler
|
||||
return true;
|
||||
}
|
||||
|
||||
static class EscapeFinalizer implements Runnable
|
||||
private static class EscapeFinalizer implements Runnable
|
||||
{
|
||||
private final Player _player;
|
||||
private final Location _partnerLoc;
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.model.quest.State;
|
||||
*/
|
||||
public class Q00257_TheGuardIsBusy extends Quest
|
||||
{
|
||||
public static final class MobDrop extends ItemHolder
|
||||
public static class MobDrop extends ItemHolder
|
||||
{
|
||||
private final int _chance;
|
||||
private final int _random;
|
||||
|
||||
+2
-2
@@ -59,7 +59,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
|
||||
PARTY_RANDOM
|
||||
}
|
||||
|
||||
private static final class LevelingInfo
|
||||
private static class LevelingInfo
|
||||
{
|
||||
private final AbsorbCrystalType _absorbCrystalType;
|
||||
private final boolean _isSkillNeeded;
|
||||
@@ -88,7 +88,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
|
||||
}
|
||||
}
|
||||
|
||||
private static final class SoulCrystal
|
||||
private static class SoulCrystal
|
||||
{
|
||||
private final int _level;
|
||||
private final int _itemId;
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.util.Util;
|
||||
*/
|
||||
public class Q00352_HelpRoodRaiseANewPet extends Quest
|
||||
{
|
||||
private static final class DropInfo
|
||||
private static class DropInfo
|
||||
{
|
||||
public int _firstChance;
|
||||
public int _secondChance;
|
||||
|
||||
Vendored
+1
-1
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.util.Util;
|
||||
*/
|
||||
public class Q00355_FamilyHonor extends Quest
|
||||
{
|
||||
private static final class DropInfo
|
||||
private static class DropInfo
|
||||
{
|
||||
public int _firstChance;
|
||||
public int _secondChance;
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.util.Util;
|
||||
*/
|
||||
public class Q00371_ShrieksOfGhosts extends Quest
|
||||
{
|
||||
private static final class DropInfo
|
||||
private static class DropInfo
|
||||
{
|
||||
public int _firstChance;
|
||||
public int _secondChance;
|
||||
|
||||
+1
-1
@@ -452,7 +452,7 @@ public class Q00373_SupplierOfReagents extends Quest
|
||||
return htmltext;
|
||||
}
|
||||
|
||||
private static final class Entry
|
||||
private static class Entry
|
||||
{
|
||||
private final int item;
|
||||
private final String html;
|
||||
|
||||
+1
-1
@@ -486,7 +486,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
|
||||
return player.getInventory().getItemByItemId(fluteItemId);
|
||||
}
|
||||
|
||||
private static final class NpcData
|
||||
private static class NpcData
|
||||
{
|
||||
public NpcStringId message;
|
||||
public int memoStateMod;
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.quest.QuestState;
|
||||
*/
|
||||
public class Q00619_RelicsOfTheOldEmpire extends Quest
|
||||
{
|
||||
private static final class DropInfo
|
||||
private static class DropInfo
|
||||
{
|
||||
public double _dropChance;
|
||||
public int _doubleItemChance;
|
||||
|
||||
@@ -3224,7 +3224,7 @@ public class Config
|
||||
return serverType;
|
||||
}
|
||||
|
||||
public static final class ClassMasterSettings
|
||||
public static class ClassMasterSettings
|
||||
{
|
||||
private final Map<Integer, List<ItemHolder>> _claimItems = new HashMap<>(3);
|
||||
private final Map<Integer, List<ItemHolder>> _rewardItems = new HashMap<>(3);
|
||||
|
||||
@@ -533,7 +533,7 @@ public class Shutdown extends Thread
|
||||
* A simple class used to track down the estimated time of method executions.<br>
|
||||
* Once this class is created, it saves the start time, and when you want to get the estimated time, use the getEstimatedTime() method.
|
||||
*/
|
||||
private static final class TimeCounter
|
||||
private static class TimeCounter
|
||||
{
|
||||
private long _startTime;
|
||||
|
||||
|
||||
@@ -342,7 +342,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
|
||||
attackPrepare();
|
||||
}
|
||||
|
||||
private final void factionNotifyAndSupport()
|
||||
private void factionNotifyAndSupport()
|
||||
{
|
||||
final Creature target = getAttackTarget();
|
||||
// Call all WorldObject of its Faction inside the Faction Range
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.cache;
|
||||
/**
|
||||
* @author Sahar
|
||||
*/
|
||||
public final class RelationCache
|
||||
public class RelationCache
|
||||
{
|
||||
private final int _relation;
|
||||
private final boolean _isAutoAttackable;
|
||||
|
||||
@@ -190,7 +190,7 @@ public class AugmentationData
|
||||
}
|
||||
}
|
||||
|
||||
private final void load()
|
||||
private void load()
|
||||
{
|
||||
// Load stats
|
||||
final DocumentBuilderFactory factory2 = DocumentBuilderFactory.newInstance();
|
||||
|
||||
+1
-1
@@ -181,7 +181,7 @@ public class MerchantPriceConfigTable
|
||||
/**
|
||||
* @author KenM
|
||||
*/
|
||||
public static final class MerchantPriceConfig
|
||||
public static class MerchantPriceConfig
|
||||
{
|
||||
private final int _id;
|
||||
private final String _name;
|
||||
|
||||
@@ -59,7 +59,7 @@ public class CharNameTable
|
||||
}
|
||||
}
|
||||
|
||||
private final void addName(int objectId, String name)
|
||||
private void addName(int objectId, String name)
|
||||
{
|
||||
if ((name != null) && !name.equals(_chars.get(objectId)))
|
||||
{
|
||||
|
||||
@@ -61,7 +61,7 @@ public class ClanHallTable
|
||||
}
|
||||
|
||||
/** Load All Clan Hall */
|
||||
private final void load()
|
||||
private void load()
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection();
|
||||
Statement s = con.createStatement();
|
||||
|
||||
@@ -374,7 +374,7 @@ public class MultisellData implements IXmlReader
|
||||
}
|
||||
}
|
||||
|
||||
private final void verify()
|
||||
private void verify()
|
||||
{
|
||||
ListContainer list;
|
||||
final Iterator<ListContainer> iter = _entries.values().iterator();
|
||||
|
||||
@@ -315,7 +315,7 @@ public enum ClassId implements IIdentifiable
|
||||
return _nextClassIds;
|
||||
}
|
||||
|
||||
private final void addNextClassId(ClassId cId)
|
||||
private void addNextClassId(ClassId cId)
|
||||
{
|
||||
_nextClassIds.add(cId);
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.geoengine.geodata;
|
||||
/**
|
||||
* @author HorridoJoho
|
||||
*/
|
||||
public final class Cell
|
||||
public class Cell
|
||||
{
|
||||
/** East NSWE flag */
|
||||
public static final byte NSWE_EAST = 1 << 0;
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.regions.Region;
|
||||
/**
|
||||
* @author HorridoJoho
|
||||
*/
|
||||
public final class GeoData
|
||||
public class GeoData
|
||||
{
|
||||
// world dimensions: 1048576 * 1048576 = 1099511627776
|
||||
private static final int WORLD_MIN_X = -655360;
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.IBlock;
|
||||
/**
|
||||
* @author HorridoJoho
|
||||
*/
|
||||
public final class ComplexBlock implements IBlock
|
||||
public class ComplexBlock implements IBlock
|
||||
{
|
||||
private final short[] _data;
|
||||
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.IRegion;
|
||||
/**
|
||||
* @author HorridoJoho
|
||||
*/
|
||||
public final class NullRegion implements IRegion
|
||||
public class NullRegion implements IRegion
|
||||
{
|
||||
public static final NullRegion INSTANCE = new NullRegion();
|
||||
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.blocks.MultilayerBlock;
|
||||
/**
|
||||
* @author HorridoJoho
|
||||
*/
|
||||
public final class Region implements IRegion
|
||||
public class Region implements IRegion
|
||||
{
|
||||
private final IBlock[] _blocks = new IBlock[IRegion.REGION_BLOCKS];
|
||||
|
||||
|
||||
+2
-2
@@ -85,7 +85,7 @@ public class CellNodeBuffer
|
||||
return null;
|
||||
}
|
||||
|
||||
public final void free()
|
||||
public void free()
|
||||
{
|
||||
_current = null;
|
||||
|
||||
@@ -136,7 +136,7 @@ public class CellNodeBuffer
|
||||
return result;
|
||||
}
|
||||
|
||||
private final void getNeighbors()
|
||||
private void getNeighbors()
|
||||
{
|
||||
if (_current.getLoc().canGoNone())
|
||||
{
|
||||
|
||||
@@ -70,7 +70,7 @@ public class EffectHandler implements IHandler<Class<? extends AbstractEffect>,
|
||||
}
|
||||
}
|
||||
|
||||
private static final class SingletonHolder
|
||||
private static class SingletonHolder
|
||||
{
|
||||
protected static final EffectHandler INSTANCE = new EffectHandler();
|
||||
}
|
||||
|
||||
+2
-2
@@ -52,7 +52,7 @@ public class CHSiegeManager
|
||||
loadClanHalls();
|
||||
}
|
||||
|
||||
private final void loadClanHalls()
|
||||
private void loadClanHalls()
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection();
|
||||
Statement s = con.createStatement();
|
||||
@@ -201,7 +201,7 @@ public class CHSiegeManager
|
||||
return SingletonHolder.INSTANCE;
|
||||
}
|
||||
|
||||
private static final class SingletonHolder
|
||||
private static class SingletonHolder
|
||||
{
|
||||
protected static final CHSiegeManager INSTANCE = new CHSiegeManager();
|
||||
}
|
||||
|
||||
+2
-2
@@ -156,7 +156,7 @@ public class CastleManorManager implements IXmlReader, IStorable
|
||||
}
|
||||
}
|
||||
|
||||
private final void loadDb()
|
||||
private void loadDb()
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection();
|
||||
PreparedStatement stProduction = con.prepareStatement("SELECT * FROM castle_manor_production WHERE castle_id=?");
|
||||
@@ -242,7 +242,7 @@ public class CastleManorManager implements IXmlReader, IStorable
|
||||
// -------------------------------------------------------
|
||||
// Manor methods
|
||||
// -------------------------------------------------------
|
||||
private final void scheduleModeChange()
|
||||
private void scheduleModeChange()
|
||||
{
|
||||
// Calculate next mode change
|
||||
_nextModeChange = Calendar.getInstance();
|
||||
|
||||
+1
-1
@@ -96,7 +96,7 @@ public class ClanHallAuctionManager
|
||||
load();
|
||||
}
|
||||
|
||||
private final void load()
|
||||
private void load()
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection();
|
||||
Statement s = con.createStatement();
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ public class CoupleManager
|
||||
load();
|
||||
}
|
||||
|
||||
private final void load()
|
||||
private void load()
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection();
|
||||
Statement ps = con.createStatement();
|
||||
|
||||
+3
-3
@@ -85,7 +85,7 @@ public class CursedWeaponsManager
|
||||
init();
|
||||
}
|
||||
|
||||
private final void load()
|
||||
private void load()
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -161,7 +161,7 @@ public class CursedWeaponsManager
|
||||
}
|
||||
}
|
||||
|
||||
private final void restore()
|
||||
private void restore()
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection();
|
||||
Statement s = con.createStatement();
|
||||
@@ -186,7 +186,7 @@ public class CursedWeaponsManager
|
||||
}
|
||||
}
|
||||
|
||||
private final void controlPlayers()
|
||||
private void controlPlayers()
|
||||
{
|
||||
// TODO: See comments below...
|
||||
// This entire for loop should NOT be necessary, since it is already handled by
|
||||
|
||||
+1
-1
@@ -142,7 +142,7 @@ public class MercTicketManager
|
||||
/**
|
||||
* Load merc tickets into the world.
|
||||
*/
|
||||
private final void load()
|
||||
private void load()
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection();
|
||||
Statement s = con.createStatement();
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ public class RaidBossPointsManager
|
||||
init();
|
||||
}
|
||||
|
||||
private final void init()
|
||||
private void init()
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection();
|
||||
Statement s = con.createStatement();
|
||||
|
||||
+2
-2
@@ -116,7 +116,7 @@ public class SiegeManager
|
||||
}
|
||||
}
|
||||
|
||||
private final void load()
|
||||
private void load()
|
||||
{
|
||||
final PropertiesParser siegeSettings = new PropertiesParser(Config.SIEGE_CONFIG_FILE);
|
||||
|
||||
@@ -274,7 +274,7 @@ public class SiegeManager
|
||||
return sieges;
|
||||
}
|
||||
|
||||
private final void loadTrapUpgrade(int castleId)
|
||||
private void loadTrapUpgrade(int castleId)
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection();
|
||||
PreparedStatement ps = con.prepareStatement("SELECT * FROM castle_trapupgrade WHERE castleId=?"))
|
||||
|
||||
@@ -243,7 +243,7 @@ public class PetData
|
||||
return _skills;
|
||||
}
|
||||
|
||||
public static final class PetSkillLearn extends SkillHolder
|
||||
public static class PetSkillLearn extends SkillHolder
|
||||
{
|
||||
private final int _minLevel;
|
||||
|
||||
|
||||
@@ -85,7 +85,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
* Sets the instance type.
|
||||
* @param newInstanceType the instance type to set
|
||||
*/
|
||||
protected final void setInstanceType(InstanceType newInstanceType)
|
||||
protected void setInstanceType(InstanceType newInstanceType)
|
||||
{
|
||||
_instanceType = newInstanceType;
|
||||
}
|
||||
@@ -735,7 +735,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
||||
* @param instance the instance to update
|
||||
* @param hide if {@code true} hide the player
|
||||
*/
|
||||
private final void sendInstanceUpdate(Instance instance, boolean hide)
|
||||
private void sendInstanceUpdate(Instance instance, boolean hide)
|
||||
{
|
||||
// final int startTime = (int) ((System.currentTimeMillis() - instance.getInstanceStartTime()) / 1000);
|
||||
// final int endTime = (int) ((instance.getInstanceEndTime() - instance.getInstanceStartTime()) / 1000);
|
||||
|
||||
@@ -325,7 +325,7 @@ public class Attackable extends Npc
|
||||
return true;
|
||||
}
|
||||
|
||||
static class PartyContainer
|
||||
private static class PartyContainer
|
||||
{
|
||||
public Party party;
|
||||
public long damage;
|
||||
|
||||
@@ -2821,7 +2821,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
return _isRunning;
|
||||
}
|
||||
|
||||
private final void setRunning(boolean value)
|
||||
private void setRunning(boolean value)
|
||||
{
|
||||
if (_isRunning == value)
|
||||
{
|
||||
@@ -2991,7 +2991,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
||||
* When a new instance of Creature is spawned, server just create a link between the instance and the template This link is stored in <b>_template</b>.
|
||||
* @param template
|
||||
*/
|
||||
protected final void setTemplate(CreatureTemplate template)
|
||||
protected void setTemplate(CreatureTemplate template)
|
||||
{
|
||||
_template = template;
|
||||
}
|
||||
|
||||
@@ -1458,7 +1458,7 @@ public class Npc extends Creature
|
||||
}
|
||||
|
||||
@Override
|
||||
protected final void notifyQuestEventSkillFinished(Skill skill, WorldObject target)
|
||||
protected void notifyQuestEventSkillFinished(Skill skill, WorldObject target)
|
||||
{
|
||||
if ((target != null) && target.isPlayable() && EventDispatcher.getInstance().hasListener(EventType.ON_NPC_SKILL_FINISHED, this))
|
||||
{
|
||||
|
||||
@@ -12856,7 +12856,7 @@ public class Player extends Playable
|
||||
* Add a skill level to the custom skills map.
|
||||
* @param skill the skill to add
|
||||
*/
|
||||
private final void addCustomSkill(Skill skill)
|
||||
private void addCustomSkill(Skill skill)
|
||||
{
|
||||
if ((skill == null) || (skill.getDisplayId() == skill.getId()))
|
||||
{
|
||||
@@ -12873,7 +12873,7 @@ public class Player extends Playable
|
||||
* Remove a skill level from the custom skill map.
|
||||
* @param skill the skill to remove
|
||||
*/
|
||||
private final void removeCustomSkill(Skill skill)
|
||||
private void removeCustomSkill(Skill skill)
|
||||
{
|
||||
if ((skill != null) && (_customSkills != null) && (skill.getDisplayId() != skill.getId()))
|
||||
{
|
||||
|
||||
+2
-2
@@ -184,7 +184,7 @@ public class BabyPet extends Pet
|
||||
}
|
||||
}
|
||||
|
||||
private final void startCastTask()
|
||||
private void startCastTask()
|
||||
{
|
||||
if ((_majorHeal != null) || (_buffs != null) || ((_recharge != null) && (_castTask == null) && !isDead()))
|
||||
{
|
||||
@@ -207,7 +207,7 @@ public class BabyPet extends Pet
|
||||
return _bufferMode;
|
||||
}
|
||||
|
||||
private final void stopCastTask()
|
||||
private void stopCastTask()
|
||||
{
|
||||
if (_castTask != null)
|
||||
{
|
||||
|
||||
+2
-2
@@ -33,7 +33,7 @@ public class CastleDoorman extends Doorman
|
||||
}
|
||||
|
||||
@Override
|
||||
protected final void openDoors(Player player, String command)
|
||||
protected void openDoors(Player player, String command)
|
||||
{
|
||||
final StringTokenizer st = new StringTokenizer(command.substring(10), ", ");
|
||||
st.nextToken();
|
||||
@@ -52,7 +52,7 @@ public class CastleDoorman extends Doorman
|
||||
}
|
||||
|
||||
@Override
|
||||
protected final void closeDoors(Player player, String command)
|
||||
protected void closeDoors(Player player, String command)
|
||||
{
|
||||
final StringTokenizer st = new StringTokenizer(command.substring(11), ", ");
|
||||
st.nextToken();
|
||||
|
||||
+2
-2
@@ -167,7 +167,7 @@ public class ClanHallDoorman extends Doorman
|
||||
}
|
||||
|
||||
@Override
|
||||
protected final void openDoors(Player player, String command)
|
||||
protected void openDoors(Player player, String command)
|
||||
{
|
||||
getClanHall().openCloseDoors(true);
|
||||
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
|
||||
@@ -177,7 +177,7 @@ public class ClanHallDoorman extends Doorman
|
||||
}
|
||||
|
||||
@Override
|
||||
protected final void closeDoors(Player player, String command)
|
||||
protected void closeDoors(Player player, String command)
|
||||
{
|
||||
getClanHall().openCloseDoors(false);
|
||||
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.clientstrings;
|
||||
/**
|
||||
* @author Forsaiken
|
||||
*/
|
||||
final class BuilderContainer extends Builder
|
||||
public class BuilderContainer extends Builder
|
||||
{
|
||||
private final Builder[] _builders;
|
||||
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.clientstrings;
|
||||
/**
|
||||
* @author Forsaiken
|
||||
*/
|
||||
final class BuilderObject extends Builder
|
||||
public class BuilderObject extends Builder
|
||||
{
|
||||
private final int _index;
|
||||
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.clientstrings;
|
||||
/**
|
||||
* @author Forsaiken
|
||||
*/
|
||||
final class BuilderText extends Builder
|
||||
public class BuilderText extends Builder
|
||||
{
|
||||
private final String _text;
|
||||
|
||||
|
||||
+5
-5
@@ -101,7 +101,7 @@ public abstract class Inventory extends ItemContainer
|
||||
private int _wearedMask;
|
||||
|
||||
// Recorder of alterations in inventory
|
||||
private static final class ChangeRecorder implements PaperdollListener
|
||||
private static class ChangeRecorder implements PaperdollListener
|
||||
{
|
||||
private final Inventory _inventory;
|
||||
private final List<Item> _changed = new ArrayList<>(1);
|
||||
@@ -150,7 +150,7 @@ public abstract class Inventory extends ItemContainer
|
||||
}
|
||||
}
|
||||
|
||||
private static final class BowCrossRodListener implements PaperdollListener
|
||||
private static class BowCrossRodListener implements PaperdollListener
|
||||
{
|
||||
private static BowCrossRodListener instance = new BowCrossRodListener();
|
||||
|
||||
@@ -204,7 +204,7 @@ public abstract class Inventory extends ItemContainer
|
||||
}
|
||||
}
|
||||
|
||||
private static final class StatsListener implements PaperdollListener
|
||||
private static class StatsListener implements PaperdollListener
|
||||
{
|
||||
private static StatsListener instance = new StatsListener();
|
||||
|
||||
@@ -226,7 +226,7 @@ public abstract class Inventory extends ItemContainer
|
||||
}
|
||||
}
|
||||
|
||||
private static final class ItemSkillsListener implements PaperdollListener
|
||||
private static class ItemSkillsListener implements PaperdollListener
|
||||
{
|
||||
private static ItemSkillsListener instance = new ItemSkillsListener();
|
||||
|
||||
@@ -431,7 +431,7 @@ public abstract class Inventory extends ItemContainer
|
||||
}
|
||||
}
|
||||
|
||||
private static final class ArmorSetListener implements PaperdollListener
|
||||
private static class ArmorSetListener implements PaperdollListener
|
||||
{
|
||||
private static ArmorSetListener instance = new ArmorSetListener();
|
||||
|
||||
|
||||
@@ -200,7 +200,7 @@ public class Options
|
||||
player.sendSkillList();
|
||||
}
|
||||
|
||||
private final void addSkill(Player player, Skill skill)
|
||||
private void addSkill(Player player, Skill skill)
|
||||
{
|
||||
boolean updateTimeStamp = false;
|
||||
player.addSkill(skill, false);
|
||||
|
||||
+1
-1
@@ -105,7 +105,7 @@ public class AuctionableHall extends ClanHall
|
||||
* Initialize Fee Task
|
||||
* @param forced
|
||||
*/
|
||||
private final void initialyzeTask(boolean forced)
|
||||
private void initialyzeTask(boolean forced)
|
||||
{
|
||||
final long currentTime = System.currentTimeMillis();
|
||||
if (_paidUntil > currentTime)
|
||||
|
||||
+2
-2
@@ -171,7 +171,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
|
||||
}
|
||||
}
|
||||
|
||||
private final void spawnSiegeGuards()
|
||||
private void spawnSiegeGuards()
|
||||
{
|
||||
for (Spawn guard : _guards)
|
||||
{
|
||||
@@ -183,7 +183,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
|
||||
}
|
||||
}
|
||||
|
||||
private final void unSpawnSiegeGuards()
|
||||
private void unSpawnSiegeGuards()
|
||||
{
|
||||
if (_guards != null)
|
||||
{
|
||||
|
||||
@@ -90,7 +90,7 @@ public enum BaseStat
|
||||
throw new NoSuchElementException("Unknown name '" + internName + "' for enum BaseStats");
|
||||
}
|
||||
|
||||
protected static final class STR implements IBaseStatFunction
|
||||
protected static class STR implements IBaseStatFunction
|
||||
{
|
||||
@Override
|
||||
public double calcBonus(Creature actor)
|
||||
@@ -99,7 +99,7 @@ public enum BaseStat
|
||||
}
|
||||
}
|
||||
|
||||
protected static final class INT implements IBaseStatFunction
|
||||
protected static class INT implements IBaseStatFunction
|
||||
{
|
||||
@Override
|
||||
public double calcBonus(Creature actor)
|
||||
@@ -108,7 +108,7 @@ public enum BaseStat
|
||||
}
|
||||
}
|
||||
|
||||
protected static final class DEX implements IBaseStatFunction
|
||||
protected static class DEX implements IBaseStatFunction
|
||||
{
|
||||
@Override
|
||||
public double calcBonus(Creature actor)
|
||||
@@ -117,7 +117,7 @@ public enum BaseStat
|
||||
}
|
||||
}
|
||||
|
||||
protected static final class WIT implements IBaseStatFunction
|
||||
protected static class WIT implements IBaseStatFunction
|
||||
{
|
||||
@Override
|
||||
public double calcBonus(Creature actor)
|
||||
@@ -126,7 +126,7 @@ public enum BaseStat
|
||||
}
|
||||
}
|
||||
|
||||
protected static final class CON implements IBaseStatFunction
|
||||
protected static class CON implements IBaseStatFunction
|
||||
{
|
||||
@Override
|
||||
public double calcBonus(Creature actor)
|
||||
@@ -135,7 +135,7 @@ public enum BaseStat
|
||||
}
|
||||
}
|
||||
|
||||
protected static final class MEN implements IBaseStatFunction
|
||||
protected static class MEN implements IBaseStatFunction
|
||||
{
|
||||
@Override
|
||||
public double calcBonus(Creature actor)
|
||||
@@ -144,7 +144,7 @@ public enum BaseStat
|
||||
}
|
||||
}
|
||||
|
||||
protected static final class NONE implements IBaseStatFunction
|
||||
protected static class NONE implements IBaseStatFunction
|
||||
{
|
||||
@Override
|
||||
public double calcBonus(Creature actor)
|
||||
|
||||
@@ -48,7 +48,7 @@ public abstract class ZoneForm
|
||||
|
||||
public abstract void visualizeZone(int z);
|
||||
|
||||
protected final void dropDebugItem(int itemId, int num, int x, int y, int z)
|
||||
protected void dropDebugItem(int itemId, int num, int x, int y, int z)
|
||||
{
|
||||
final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
|
||||
item.setCount(num);
|
||||
|
||||
@@ -17970,7 +17970,7 @@ public class NpcStringId
|
||||
return _id;
|
||||
}
|
||||
|
||||
private final void setName(String name)
|
||||
private void setName(String name)
|
||||
{
|
||||
_name = name;
|
||||
}
|
||||
@@ -18068,7 +18068,7 @@ public class NpcStringId
|
||||
return "NS[" + getId() + ":" + getName() + "]";
|
||||
}
|
||||
|
||||
public static final class NSLocalisation
|
||||
public static class NSLocalisation
|
||||
{
|
||||
private final String _lang;
|
||||
private final Builder _builder;
|
||||
|
||||
+1
-1
@@ -10012,7 +10012,7 @@ public class SystemMessageId
|
||||
return "SM[" + getId() + ":" + getName() + "]";
|
||||
}
|
||||
|
||||
public static final class SMLocalisation
|
||||
public static class SMLocalisation
|
||||
{
|
||||
private final String _lang;
|
||||
private final Builder _builder;
|
||||
|
||||
+1
-1
@@ -44,7 +44,7 @@ public abstract class AbstractRefinePacket implements ClientPacket
|
||||
|
||||
private static final Map<Integer, LifeStone> _lifeStones = new HashMap<>();
|
||||
|
||||
protected static final class LifeStone
|
||||
protected static class LifeStone
|
||||
{
|
||||
// lifestone level to player level table
|
||||
private static final int[] LEVELS =
|
||||
|
||||
+1
-1
@@ -204,7 +204,7 @@ public class RequestProcureCropList implements ClientPacket
|
||||
}
|
||||
}
|
||||
|
||||
private final class CropHolder extends UniqueItemHolder
|
||||
private class CropHolder extends UniqueItemHolder
|
||||
{
|
||||
private final int _manorId;
|
||||
private CropProcure _cp;
|
||||
|
||||
+1
-1
@@ -117,7 +117,7 @@ public class RequestRestartPoint implements ClientPacket
|
||||
portPlayer(player);
|
||||
}
|
||||
|
||||
protected final void portPlayer(Player player)
|
||||
protected void portPlayer(Player player)
|
||||
{
|
||||
Location loc = null;
|
||||
Castle castle = null;
|
||||
|
||||
+1
-1
@@ -69,7 +69,7 @@ public class ServerStatus extends WritablePacket
|
||||
public static final int ON = 0x01;
|
||||
public static final int OFF = 0x00;
|
||||
|
||||
static class Attribute
|
||||
private static class Attribute
|
||||
{
|
||||
public int id;
|
||||
public int value;
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ public class SkillList extends ServerPacket
|
||||
}
|
||||
}
|
||||
|
||||
static class Skill
|
||||
private static class Skill
|
||||
{
|
||||
public int id;
|
||||
public int level;
|
||||
|
||||
+1
-1
@@ -56,7 +56,7 @@ public class StatusUpdate extends ServerPacket
|
||||
private final int _objectId;
|
||||
private final List<Attribute> _attributes = new ArrayList<>();
|
||||
|
||||
static class Attribute
|
||||
private static class Attribute
|
||||
{
|
||||
/**
|
||||
* id values 09 - current health 0a - max health 0b - current mana 0c - max mana
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ import javax.tools.StandardJavaFileManager;
|
||||
/**
|
||||
* @author HorridoJoho
|
||||
*/
|
||||
final class ScriptingFileManager implements StandardJavaFileManager
|
||||
public class ScriptingFileManager implements StandardJavaFileManager
|
||||
{
|
||||
private final StandardJavaFileManager _wrapped;
|
||||
private final LinkedList<ScriptingOutputFileObject> _classOutputs = new LinkedList<>();
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ import javax.tools.JavaFileObject;
|
||||
/**
|
||||
* @author HorridoJoho
|
||||
*/
|
||||
final class ScriptingOutputFileObject implements JavaFileObject
|
||||
public class ScriptingOutputFileObject implements JavaFileObject
|
||||
{
|
||||
private final Path _sourcePath;
|
||||
private final String _javaName;
|
||||
|
||||
@@ -254,7 +254,7 @@ public class Evolve
|
||||
return true;
|
||||
}
|
||||
|
||||
static final class EvolveFeedWait implements Runnable
|
||||
private static class EvolveFeedWait implements Runnable
|
||||
{
|
||||
private final Player _player;
|
||||
private final Pet _petSummon;
|
||||
@@ -286,7 +286,7 @@ public class Evolve
|
||||
}
|
||||
}
|
||||
|
||||
static final class EvolveFinalizer implements Runnable
|
||||
private static class EvolveFinalizer implements Runnable
|
||||
{
|
||||
private final Player _player;
|
||||
private final Pet _petSummon;
|
||||
|
||||
@@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExServerPrimitive;
|
||||
/**
|
||||
* @author HorridoJoho
|
||||
*/
|
||||
public final class GeoUtils
|
||||
public class GeoUtils
|
||||
{
|
||||
public static void debug2DLine(Player player, int x, int y, int tx, int ty, int z)
|
||||
{
|
||||
|
||||
@@ -224,7 +224,7 @@ public class MinionList
|
||||
}
|
||||
}
|
||||
|
||||
private final void spawnMinion(int minionId)
|
||||
private void spawnMinion(int minionId)
|
||||
{
|
||||
if (minionId == 0)
|
||||
{
|
||||
@@ -233,7 +233,7 @@ public class MinionList
|
||||
spawnMinion(_master, minionId);
|
||||
}
|
||||
|
||||
private final class MinionRespawnTask implements Runnable
|
||||
private class MinionRespawnTask implements Runnable
|
||||
{
|
||||
private final Monster _minion;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user