Cleanup of unnecessary void method and class modifiers.
This commit is contained in:
+2
-2
@@ -73,7 +73,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
|
|||||||
return super.onAdvEvent(event, npc, player);
|
return super.onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class zoneInfo
|
private static class zoneInfo
|
||||||
{
|
{
|
||||||
private int currentPoints = 0;
|
private int currentPoints = 0;
|
||||||
private int currentMonitorizedDamage = 0;
|
private int currentMonitorizedDamage = 0;
|
||||||
@@ -121,7 +121,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class changeZoneStage implements Runnable
|
private static class changeZoneStage implements Runnable
|
||||||
{
|
{
|
||||||
private final ZoneType _zone;
|
private final ZoneType _zone;
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -437,7 +437,7 @@ public class Trandon extends AbstractNpcAI
|
|||||||
return "DualSkill-" + level;
|
return "DualSkill-" + level;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void takeSkills(Player player, String type)
|
private void takeSkills(Player player, String type)
|
||||||
{
|
{
|
||||||
final PlayerVariables vars = player.getVariables();
|
final PlayerVariables vars = player.getVariables();
|
||||||
final String list = vars.getString(type, "");
|
final String list = vars.getString(type, "");
|
||||||
@@ -455,7 +455,7 @@ public class Trandon extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void giveSkills(Player player, String type)
|
private void giveSkills(Player player, String type)
|
||||||
{
|
{
|
||||||
final String list = player.getVariables().getString(type, "");
|
final String list = player.getVariables().getString(type, "");
|
||||||
if (!list.isEmpty())
|
if (!list.isEmpty())
|
||||||
|
|||||||
+1
-1
@@ -768,7 +768,7 @@ public class Antharas extends AbstractNpcAI
|
|||||||
GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime);
|
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))
|
if ((attacker_1 != null) && (attacker == attacker_1))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -621,12 +621,12 @@ public class Baium extends AbstractNpcAI
|
|||||||
return super.unload(removeFromList);
|
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);
|
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 newAggroVal = damage + getRandom(3000);
|
||||||
final int aggroVal = aggro + 1000;
|
final int aggroVal = aggro + 1000;
|
||||||
|
|||||||
Vendored
+1
-1
@@ -178,7 +178,7 @@ public class CastleChamberlain extends AbstractNpcAI
|
|||||||
return "chamberlain-21.html";
|
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.getCastleFunction(func);
|
final CastleFunction function = castle.getCastleFunction(func);
|
||||||
if (function == null)
|
if (function == null)
|
||||||
|
|||||||
Vendored
+1
-1
@@ -1521,7 +1521,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
activeChar.sendPacket(adminReply);
|
activeChar.sendPacket(adminReply);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final class IpPack
|
private class IpPack
|
||||||
{
|
{
|
||||||
String ip;
|
String ip;
|
||||||
int[][] tracert;
|
int[][] tracert;
|
||||||
|
|||||||
Vendored
+1
-1
@@ -77,7 +77,7 @@ public class AdminHtml implements IAdminCommandHandler
|
|||||||
* @param activeChar activeChar where html is shown
|
* @param activeChar activeChar where html is shown
|
||||||
* @param path relative path from directory data/html/admin/ to html
|
* @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);
|
showHtml(activeChar, "data/html/admin/" + path, false);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -110,7 +110,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
|
|||||||
* @param npc NPC which allows to enter into instance
|
* @param npc NPC which allows to enter into instance
|
||||||
* @param templateId template ID of instance where player wants to enter
|
* @param templateId template ID of instance where player wants to enter
|
||||||
*/
|
*/
|
||||||
protected final void enterInstance(Player player, Npc npc, int templateId)
|
protected void enterInstance(Player player, Npc npc, int templateId)
|
||||||
{
|
{
|
||||||
Instance instance = getPlayerInstance(player);
|
Instance instance = getPlayerInstance(player);
|
||||||
if (instance != null) // Player has already any instance active
|
if (instance != null) // Player has already any instance active
|
||||||
|
|||||||
+1
-1
@@ -568,7 +568,7 @@ public class Kamaloka extends AbstractInstance
|
|||||||
* Spawn all NPCs in kamaloka
|
* Spawn all NPCs in kamaloka
|
||||||
* @param world instanceWorld
|
* @param world instanceWorld
|
||||||
*/
|
*/
|
||||||
private final void spawnKama(Instance world)
|
private void spawnKama(Instance world)
|
||||||
{
|
{
|
||||||
int[] npcs;
|
int[] npcs;
|
||||||
int[][] spawns;
|
int[][] spawns;
|
||||||
|
|||||||
+2
-2
@@ -59,7 +59,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
|
|||||||
PARTY_RANDOM
|
PARTY_RANDOM
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class LevelingInfo
|
private static class LevelingInfo
|
||||||
{
|
{
|
||||||
private final AbsorbCrystalType _absorbCrystalType;
|
private final AbsorbCrystalType _absorbCrystalType;
|
||||||
private final boolean _isSkillNeeded;
|
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 _level;
|
||||||
private final int _itemId;
|
private final int _itemId;
|
||||||
|
|||||||
+1
-1
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.util.Util;
|
|||||||
*/
|
*/
|
||||||
public class Q00371_ShrieksOfGhosts extends Quest
|
public class Q00371_ShrieksOfGhosts extends Quest
|
||||||
{
|
{
|
||||||
private static final class DropInfo
|
private static class DropInfo
|
||||||
{
|
{
|
||||||
public int _firstChance;
|
public int _firstChance;
|
||||||
public int _secondChance;
|
public int _secondChance;
|
||||||
|
|||||||
+1
-1
@@ -449,7 +449,7 @@ public class Q00373_SupplierOfReagents extends Quest
|
|||||||
return htmltext;
|
return htmltext;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class Entry
|
private static class Entry
|
||||||
{
|
{
|
||||||
private final int item;
|
private final int item;
|
||||||
private final String html;
|
private final String html;
|
||||||
|
|||||||
+1
-1
@@ -483,7 +483,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
|
|||||||
return player.getInventory().getItemByItemId(fluteItemId);
|
return player.getInventory().getItemByItemId(fluteItemId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class NpcData
|
private static class NpcData
|
||||||
{
|
{
|
||||||
public NpcStringId message;
|
public NpcStringId message;
|
||||||
public int memoStateMod;
|
public int memoStateMod;
|
||||||
|
|||||||
+1
-1
@@ -486,7 +486,7 @@ public class Q00663_SeductiveWhispers extends Quest
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class Card
|
private static class Card
|
||||||
{
|
{
|
||||||
private final int _number;
|
private final int _number;
|
||||||
private final Side _side;
|
private final Side _side;
|
||||||
|
|||||||
+2
-2
@@ -42,7 +42,7 @@ import ai.AbstractNpcAI;
|
|||||||
|
|
||||||
public abstract class AirShipController extends AbstractNpcAI
|
public abstract class AirShipController extends AbstractNpcAI
|
||||||
{
|
{
|
||||||
private final class DecayTask implements Runnable
|
private class DecayTask implements Runnable
|
||||||
{
|
{
|
||||||
public DecayTask()
|
public DecayTask()
|
||||||
{
|
{
|
||||||
@@ -58,7 +58,7 @@ public abstract class AirShipController extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private final class DepartTask implements Runnable
|
private class DepartTask implements Runnable
|
||||||
{
|
{
|
||||||
public DepartTask()
|
public DepartTask()
|
||||||
{
|
{
|
||||||
|
|||||||
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
Vendored
+2
-2
@@ -119,7 +119,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
|
|||||||
_ship.runEngine(60000);
|
_ship.runEngine(60000);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void broadcastInGludio(NpcStringId npcString)
|
private void broadcastInGludio(NpcStringId npcString)
|
||||||
{
|
{
|
||||||
if (!_foundAtcGludio)
|
if (!_foundAtcGludio)
|
||||||
{
|
{
|
||||||
@@ -132,7 +132,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void broadcastInGracia(NpcStringId npcStringId)
|
private void broadcastInGracia(NpcStringId npcStringId)
|
||||||
{
|
{
|
||||||
if (!_foundAtcGracia)
|
if (!_foundAtcGracia)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -514,7 +514,7 @@ public class Shutdown extends Thread
|
|||||||
* A simple class used to track down the estimated time of method executions.<br>
|
* 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.
|
* 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;
|
private long _startTime;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat;
|
|||||||
/**
|
/**
|
||||||
* @author Sahar
|
* @author Sahar
|
||||||
*/
|
*/
|
||||||
public final class PaperdollCache
|
public class PaperdollCache
|
||||||
{
|
{
|
||||||
private final Set<Item> _paperdollItems = ConcurrentHashMap.newKeySet();
|
private final Set<Item> _paperdollItems = ConcurrentHashMap.newKeySet();
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.cache;
|
|||||||
/**
|
/**
|
||||||
* @author Sahar
|
* @author Sahar
|
||||||
*/
|
*/
|
||||||
public final class RelationCache
|
public class RelationCache
|
||||||
{
|
{
|
||||||
private final int _relation;
|
private final int _relation;
|
||||||
private final boolean _isAutoAttackable;
|
private final boolean _isAutoAttackable;
|
||||||
|
|||||||
@@ -474,7 +474,7 @@ public class BotReportTable
|
|||||||
/**
|
/**
|
||||||
* Represents the info about a reporter
|
* Represents the info about a reporter
|
||||||
*/
|
*/
|
||||||
private final class ReporterCharData
|
private class ReporterCharData
|
||||||
{
|
{
|
||||||
private long _lastReport;
|
private long _lastReport;
|
||||||
private byte _reportPoints;
|
private byte _reportPoints;
|
||||||
@@ -510,7 +510,7 @@ public class BotReportTable
|
|||||||
/**
|
/**
|
||||||
* Represents the info about a reported character
|
* Represents the info about a reported character
|
||||||
*/
|
*/
|
||||||
private final class ReportedCharData
|
private class ReportedCharData
|
||||||
{
|
{
|
||||||
Map<Integer, Long> _reporters;
|
Map<Integer, Long> _reporters;
|
||||||
|
|
||||||
@@ -556,7 +556,7 @@ public class BotReportTable
|
|||||||
/**
|
/**
|
||||||
* SAX loader to parse /config/BotReportPunishments.xml file
|
* SAX loader to parse /config/BotReportPunishments.xml file
|
||||||
*/
|
*/
|
||||||
private final class PunishmentsLoader extends DefaultHandler
|
private class PunishmentsLoader extends DefaultHandler
|
||||||
{
|
{
|
||||||
PunishmentsLoader()
|
PunishmentsLoader()
|
||||||
{
|
{
|
||||||
@@ -622,7 +622,7 @@ public class BotReportTable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
static final BotReportTable INSTANCE = new BotReportTable();
|
static final BotReportTable INSTANCE = new BotReportTable();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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)))
|
if ((name != null) && !name.equals(_chars.get(objectId)))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ public class SayuneData implements IXmlReader
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void parseEntries(SayuneEntry lastEntry, Node n)
|
private void parseEntries(SayuneEntry lastEntry, Node n)
|
||||||
{
|
{
|
||||||
NamedNodeMap attrs;
|
NamedNodeMap attrs;
|
||||||
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
|
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
|
||||||
|
|||||||
@@ -386,7 +386,7 @@ public enum ClassId implements IIdentifiable
|
|||||||
return _nextClassIds;
|
return _nextClassIds;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void addNextClassId(ClassId cId)
|
private void addNextClassId(ClassId cId)
|
||||||
{
|
{
|
||||||
_nextClassIds.add(cId);
|
_nextClassIds.add(cId);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.geoengine.geodata;
|
|||||||
/**
|
/**
|
||||||
* @author HorridoJoho
|
* @author HorridoJoho
|
||||||
*/
|
*/
|
||||||
public final class Cell
|
public class Cell
|
||||||
{
|
{
|
||||||
/** East NSWE flag */
|
/** East NSWE flag */
|
||||||
public static final byte NSWE_EAST = 1 << 0;
|
public static final byte NSWE_EAST = 1 << 0;
|
||||||
|
|||||||
+1
-1
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.regions.Region;
|
|||||||
/**
|
/**
|
||||||
* @author HorridoJoho
|
* @author HorridoJoho
|
||||||
*/
|
*/
|
||||||
public final class GeoData
|
public class GeoData
|
||||||
{
|
{
|
||||||
// world dimensions: 1048576 * 1048576 = 1099511627776
|
// world dimensions: 1048576 * 1048576 = 1099511627776
|
||||||
private static final int WORLD_MIN_X = -655360;
|
private static final int WORLD_MIN_X = -655360;
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.IBlock;
|
|||||||
/**
|
/**
|
||||||
* @author HorridoJoho
|
* @author HorridoJoho
|
||||||
*/
|
*/
|
||||||
public final class ComplexBlock implements IBlock
|
public class ComplexBlock implements IBlock
|
||||||
{
|
{
|
||||||
private final short[] _data;
|
private final short[] _data;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.IRegion;
|
|||||||
/**
|
/**
|
||||||
* @author HorridoJoho
|
* @author HorridoJoho
|
||||||
*/
|
*/
|
||||||
public final class NullRegion implements IRegion
|
public class NullRegion implements IRegion
|
||||||
{
|
{
|
||||||
public static final NullRegion INSTANCE = new NullRegion();
|
public static final NullRegion INSTANCE = new NullRegion();
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.blocks.MultilayerBlock;
|
|||||||
/**
|
/**
|
||||||
* @author HorridoJoho
|
* @author HorridoJoho
|
||||||
*/
|
*/
|
||||||
public final class Region implements IRegion
|
public class Region implements IRegion
|
||||||
{
|
{
|
||||||
private final IBlock[] _blocks = new IBlock[IRegion.REGION_BLOCKS];
|
private final IBlock[] _blocks = new IBlock[IRegion.REGION_BLOCKS];
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -85,7 +85,7 @@ public class CellNodeBuffer
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public final void free()
|
public void free()
|
||||||
{
|
{
|
||||||
_current = null;
|
_current = null;
|
||||||
|
|
||||||
@@ -136,7 +136,7 @@ public class CellNodeBuffer
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void getNeighbors()
|
private void getNeighbors()
|
||||||
{
|
{
|
||||||
if (_current.getLoc().canGoNone())
|
if (_current.getLoc().canGoNone())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ public class ConditionHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final ConditionHandler INSTANCE = new ConditionHandler();
|
protected static final ConditionHandler INSTANCE = new ConditionHandler();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ public class EffectHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final EffectHandler INSTANCE = new EffectHandler();
|
protected static final EffectHandler INSTANCE = new EffectHandler();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ public class SkillConditionHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final SkillConditionHandler INSTANCE = new SkillConditionHandler();
|
protected static final SkillConditionHandler INSTANCE = new SkillConditionHandler();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -243,7 +243,7 @@ public class PetData
|
|||||||
return _skills;
|
return _skills;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class PetSkillLearn extends SkillHolder
|
public static class PetSkillLearn extends SkillHolder
|
||||||
{
|
{
|
||||||
private final int _minLevel;
|
private final int _minLevel;
|
||||||
|
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
|||||||
* Sets the instance type.
|
* Sets the instance type.
|
||||||
* @param newInstanceType the instance type to set
|
* @param newInstanceType the instance type to set
|
||||||
*/
|
*/
|
||||||
protected final void setInstanceType(InstanceType newInstanceType)
|
protected void setInstanceType(InstanceType newInstanceType)
|
||||||
{
|
{
|
||||||
_instanceType = newInstanceType;
|
_instanceType = newInstanceType;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -311,7 +311,7 @@ public class Attackable extends Npc
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static class PartyContainer
|
private static class PartyContainer
|
||||||
{
|
{
|
||||||
public Party party;
|
public Party party;
|
||||||
public long damage;
|
public long damage;
|
||||||
|
|||||||
@@ -2205,7 +2205,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
return _isRunning;
|
return _isRunning;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void setRunning(boolean value)
|
private void setRunning(boolean value)
|
||||||
{
|
{
|
||||||
if (_isRunning == value)
|
if (_isRunning == value)
|
||||||
{
|
{
|
||||||
@@ -2396,7 +2396,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>.
|
* 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
|
* @param template
|
||||||
*/
|
*/
|
||||||
protected final void setTemplate(CreatureTemplate template)
|
protected void setTemplate(CreatureTemplate template)
|
||||||
{
|
{
|
||||||
_template = template;
|
_template = template;
|
||||||
}
|
}
|
||||||
@@ -5657,7 +5657,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
return MoveType.STANDING;
|
return MoveType.STANDING;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final void computeStatusUpdate(StatusUpdate su, StatusUpdateType type)
|
protected void computeStatusUpdate(StatusUpdate su, StatusUpdateType type)
|
||||||
{
|
{
|
||||||
final int newValue = type.getValue(this);
|
final int newValue = type.getValue(this);
|
||||||
_statusUpdates.compute(type, (key, oldValue) ->
|
_statusUpdates.compute(type, (key, oldValue) ->
|
||||||
@@ -5671,7 +5671,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final void addStatusUpdateValue(StatusUpdateType type)
|
protected void addStatusUpdateValue(StatusUpdateType type)
|
||||||
{
|
{
|
||||||
_statusUpdates.put(type, type.getValue(this));
|
_statusUpdates.put(type, type.getValue(this));
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -297,7 +297,7 @@ public class ControllableAirShip extends AirShip
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final class ConsumeFuelTask implements Runnable
|
protected class ConsumeFuelTask implements Runnable
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
@@ -317,7 +317,7 @@ public class ControllableAirShip extends AirShip
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final class CheckTask implements Runnable
|
protected class CheckTask implements Runnable
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
@@ -330,7 +330,7 @@ public class ControllableAirShip extends AirShip
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final class DecayTask implements Runnable
|
protected class DecayTask implements Runnable
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
|
|||||||
+2
-2
@@ -56,7 +56,7 @@ public class FortDoorman extends Doorman
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void openDoors(Player player, String command)
|
protected void openDoors(Player player, String command)
|
||||||
{
|
{
|
||||||
final StringTokenizer st = new StringTokenizer(command.substring(10), ", ");
|
final StringTokenizer st = new StringTokenizer(command.substring(10), ", ");
|
||||||
st.nextToken();
|
st.nextToken();
|
||||||
@@ -68,7 +68,7 @@ public class FortDoorman extends Doorman
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void closeDoors(Player player, String command)
|
protected void closeDoors(Player player, String command)
|
||||||
{
|
{
|
||||||
final StringTokenizer st = new StringTokenizer(command.substring(11), ", ");
|
final StringTokenizer st = new StringTokenizer(command.substring(11), ", ");
|
||||||
st.nextToken();
|
st.nextToken();
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.clientstrings;
|
|||||||
/**
|
/**
|
||||||
* @author Forsaiken
|
* @author Forsaiken
|
||||||
*/
|
*/
|
||||||
final class BuilderContainer extends Builder
|
public class BuilderContainer extends Builder
|
||||||
{
|
{
|
||||||
private final Builder[] _builders;
|
private final Builder[] _builders;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.clientstrings;
|
|||||||
/**
|
/**
|
||||||
* @author Forsaiken
|
* @author Forsaiken
|
||||||
*/
|
*/
|
||||||
final class BuilderObject extends Builder
|
public class BuilderObject extends Builder
|
||||||
{
|
{
|
||||||
private final int _index;
|
private final int _index;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.clientstrings;
|
|||||||
/**
|
/**
|
||||||
* @author Forsaiken
|
* @author Forsaiken
|
||||||
*/
|
*/
|
||||||
final class BuilderText extends Builder
|
public class BuilderText extends Builder
|
||||||
{
|
{
|
||||||
private final String _text;
|
private final String _text;
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -43,22 +43,22 @@ public class ItemAuctionBid
|
|||||||
return _lastBid;
|
return _lastBid;
|
||||||
}
|
}
|
||||||
|
|
||||||
final void setLastBid(long lastBid)
|
public void setLastBid(long lastBid)
|
||||||
{
|
{
|
||||||
_lastBid = lastBid;
|
_lastBid = lastBid;
|
||||||
}
|
}
|
||||||
|
|
||||||
final void cancelBid()
|
public void cancelBid()
|
||||||
{
|
{
|
||||||
_lastBid = -1;
|
_lastBid = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
final boolean isCanceled()
|
public boolean isCanceled()
|
||||||
{
|
{
|
||||||
return _lastBid <= 0;
|
return _lastBid <= 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
final Player getPlayer()
|
public Player getPlayer()
|
||||||
{
|
{
|
||||||
return World.getInstance().getPlayer(_playerObjId);
|
return World.getInstance().getPlayer(_playerObjId);
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -232,7 +232,7 @@ public class ItemAuctionInstance
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
final void checkAndSetCurrentAndNextAuction()
|
private void checkAndSetCurrentAndNextAuction()
|
||||||
{
|
{
|
||||||
final ItemAuction[] auctions = _auctions.values().toArray(new ItemAuction[_auctions.size()]);
|
final ItemAuction[] auctions = _auctions.values().toArray(new ItemAuction[_auctions.size()]);
|
||||||
|
|
||||||
@@ -376,7 +376,7 @@ public class ItemAuctionInstance
|
|||||||
return auctions;
|
return auctions;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final class ScheduleAuctionTask implements Runnable
|
private class ScheduleAuctionTask implements Runnable
|
||||||
{
|
{
|
||||||
private final ItemAuction _auction;
|
private final ItemAuction _auction;
|
||||||
|
|
||||||
@@ -476,7 +476,7 @@ public class ItemAuctionInstance
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final void onAuctionFinished(ItemAuction auction)
|
private void onAuctionFinished(ItemAuction auction)
|
||||||
{
|
{
|
||||||
auction.broadcastToAllBiddersInternal(new SystemMessage(SystemMessageId.S1_S_AUCTION_HAS_ENDED).addInt(auction.getAuctionId()));
|
auction.broadcastToAllBiddersInternal(new SystemMessage(SystemMessageId.S1_S_AUCTION_HAS_ENDED).addInt(auction.getAuctionId()));
|
||||||
|
|
||||||
@@ -511,7 +511,7 @@ public class ItemAuctionInstance
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final void setStateTask(ScheduledFuture<?> future)
|
private void setStateTask(ScheduledFuture<?> future)
|
||||||
{
|
{
|
||||||
final ScheduledFuture<?> stateTask = _stateTask;
|
final ScheduledFuture<?> stateTask = _stateTask;
|
||||||
if (stateTask != null)
|
if (stateTask != null)
|
||||||
|
|||||||
+7
-7
@@ -146,7 +146,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
private int _blockedItemSlotsMask;
|
private int _blockedItemSlotsMask;
|
||||||
|
|
||||||
// Recorder of alterations in inventory
|
// Recorder of alterations in inventory
|
||||||
private static final class ChangeRecorder implements PaperdollListener
|
private static class ChangeRecorder implements PaperdollListener
|
||||||
{
|
{
|
||||||
private final Inventory _inventory;
|
private final Inventory _inventory;
|
||||||
private final List<Item> _changed = new ArrayList<>(1);
|
private final List<Item> _changed = new ArrayList<>(1);
|
||||||
@@ -195,7 +195,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();
|
private static BowCrossRodListener instance = new BowCrossRodListener();
|
||||||
|
|
||||||
@@ -265,7 +265,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();
|
private static StatsListener instance = new StatsListener();
|
||||||
|
|
||||||
@@ -287,7 +287,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();
|
private static ItemSkillsListener instance = new ItemSkillsListener();
|
||||||
|
|
||||||
@@ -711,7 +711,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();
|
private static ArmorSetListener instance = new ArmorSetListener();
|
||||||
|
|
||||||
@@ -913,7 +913,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class BraceletListener implements PaperdollListener
|
private static class BraceletListener implements PaperdollListener
|
||||||
{
|
{
|
||||||
private static BraceletListener instance = new BraceletListener();
|
private static BraceletListener instance = new BraceletListener();
|
||||||
|
|
||||||
@@ -949,7 +949,7 @@ public abstract class Inventory extends ItemContainer
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class BroochListener implements PaperdollListener
|
private static class BroochListener implements PaperdollListener
|
||||||
{
|
{
|
||||||
private static BroochListener instance = new BroochListener();
|
private static BroochListener instance = new BroochListener();
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -88,7 +88,7 @@ public abstract class AbstractOlympiadGame
|
|||||||
return !_aborted;
|
return !_aborted;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final void addPointsToParticipant(Participant par, int points)
|
protected void addPointsToParticipant(Participant par, int points)
|
||||||
{
|
{
|
||||||
par.updateStat(POINTS, points);
|
par.updateStat(POINTS, points);
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_EARNED_S2_POINTS_IN_THE_OLYMPIAD_GAMES);
|
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_EARNED_S2_POINTS_IN_THE_OLYMPIAD_GAMES);
|
||||||
@@ -97,7 +97,7 @@ public abstract class AbstractOlympiadGame
|
|||||||
broadcastPacket(sm);
|
broadcastPacket(sm);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final void removePointsFromParticipant(Participant par, int points)
|
protected void removePointsFromParticipant(Participant par, int points)
|
||||||
{
|
{
|
||||||
par.updateStat(POINTS, -points);
|
par.updateStat(POINTS, -points);
|
||||||
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_LOST_S2_POINTS_IN_THE_OLYMPIAD_GAMES);
|
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_LOST_S2_POINTS_IN_THE_OLYMPIAD_GAMES);
|
||||||
|
|||||||
+1
-1
@@ -68,7 +68,7 @@ public class OlympiadGameManager implements Runnable
|
|||||||
return _battleStarted;
|
return _battleStarted;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final void startBattle()
|
protected void startBattle()
|
||||||
{
|
{
|
||||||
_battleStarted = true;
|
_battleStarted = true;
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-7
@@ -144,7 +144,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void broadcastPacket(ServerPacket packet)
|
protected void broadcastPacket(ServerPacket packet)
|
||||||
{
|
{
|
||||||
if (_playerOne.updatePlayer())
|
if (_playerOne.updatePlayer())
|
||||||
{
|
{
|
||||||
@@ -181,7 +181,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void removals()
|
protected void removals()
|
||||||
{
|
{
|
||||||
if (_aborted)
|
if (_aborted)
|
||||||
{
|
{
|
||||||
@@ -213,7 +213,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void cleanEffects()
|
protected void cleanEffects()
|
||||||
{
|
{
|
||||||
if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected() && (_playerOne.getPlayer().getOlympiadGameId() == _stadiumId))
|
if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected() && (_playerOne.getPlayer().getOlympiadGameId() == _stadiumId))
|
||||||
{
|
{
|
||||||
@@ -227,7 +227,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void portPlayersBack()
|
protected void portPlayersBack()
|
||||||
{
|
{
|
||||||
if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected())
|
if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected())
|
||||||
{
|
{
|
||||||
@@ -240,7 +240,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void playersStatusBack()
|
protected void playersStatusBack()
|
||||||
{
|
{
|
||||||
if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected() && (_playerOne.getPlayer().getOlympiadGameId() == _stadiumId))
|
if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected() && (_playerOne.getPlayer().getOlympiadGameId() == _stadiumId))
|
||||||
{
|
{
|
||||||
@@ -254,7 +254,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void clearPlayers()
|
protected void clearPlayers()
|
||||||
{
|
{
|
||||||
_playerOne.setPlayer(null);
|
_playerOne.setPlayer(null);
|
||||||
_playerOne = null;
|
_playerOne = null;
|
||||||
@@ -263,7 +263,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void handleDisconnect(Player player)
|
protected void handleDisconnect(Player player)
|
||||||
{
|
{
|
||||||
if (player.getObjectId() == _playerOne.getObjectId())
|
if (player.getObjectId() == _playerOne.getObjectId())
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -83,7 +83,7 @@ public class OlympiadManager
|
|||||||
return _nonClassBasedRegisters.size() >= Config.ALT_OLY_NONCLASSED;
|
return _nonClassBasedRegisters.size() >= Config.ALT_OLY_NONCLASSED;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final void clearRegistered()
|
protected void clearRegistered()
|
||||||
{
|
{
|
||||||
_nonClassBasedRegisters.clear();
|
_nonClassBasedRegisters.clear();
|
||||||
_classBasedRegisters.clear();
|
_classBasedRegisters.clear();
|
||||||
|
|||||||
+1
-1
@@ -53,7 +53,7 @@ public class ClanHallAuction
|
|||||||
loadBidder();
|
loadBidder();
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void loadBidder()
|
private void loadBidder()
|
||||||
{
|
{
|
||||||
try (Connection con = DatabaseFactory.getConnection();
|
try (Connection con = DatabaseFactory.getConnection();
|
||||||
PreparedStatement ps = con.prepareStatement(LOAD_CLANHALL_BIDDERS))
|
PreparedStatement ps = con.prepareStatement(LOAD_CLANHALL_BIDDERS))
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ public abstract class ZoneForm
|
|||||||
|
|
||||||
public abstract void visualizeZone(int z);
|
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);
|
final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
|
||||||
item.setCount(num);
|
item.setCount(num);
|
||||||
|
|||||||
+3
-3
@@ -107,7 +107,7 @@ public class OlympiadStadiumZone extends ZoneRespawn
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void onEnter(Creature creature)
|
protected void onEnter(Creature creature)
|
||||||
{
|
{
|
||||||
if ((getSettings().getOlympiadTask() != null) && getSettings().getOlympiadTask().isBattleStarted())
|
if ((getSettings().getOlympiadTask() != null) && getSettings().getOlympiadTask().isBattleStarted())
|
||||||
{
|
{
|
||||||
@@ -143,7 +143,7 @@ public class OlympiadStadiumZone extends ZoneRespawn
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void onExit(Creature creature)
|
protected void onExit(Creature creature)
|
||||||
{
|
{
|
||||||
if ((getSettings().getOlympiadTask() != null) && getSettings().getOlympiadTask().isBattleStarted())
|
if ((getSettings().getOlympiadTask() != null) && getSettings().getOlympiadTask().isBattleStarted())
|
||||||
{
|
{
|
||||||
@@ -156,7 +156,7 @@ public class OlympiadStadiumZone extends ZoneRespawn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class KickPlayer implements Runnable
|
private static class KickPlayer implements Runnable
|
||||||
{
|
{
|
||||||
private Player _player;
|
private Player _player;
|
||||||
|
|
||||||
|
|||||||
@@ -33363,7 +33363,7 @@ public class NpcStringId
|
|||||||
return "NS[" + getId() + ":" + getName() + "]";
|
return "NS[" + getId() + ":" + getName() + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class NSLocalisation
|
public static class NSLocalisation
|
||||||
{
|
{
|
||||||
private final String _lang;
|
private final String _lang;
|
||||||
private final Builder _builder;
|
private final Builder _builder;
|
||||||
|
|||||||
@@ -14236,7 +14236,7 @@ public class SystemMessageId
|
|||||||
return "SM[" + getId() + ": " + getName() + "]";
|
return "SM[" + getId() + ": " + getName() + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class SMLocalisation
|
public static class SMLocalisation
|
||||||
{
|
{
|
||||||
private final String _lang;
|
private final String _lang;
|
||||||
private final Builder _builder;
|
private final Builder _builder;
|
||||||
|
|||||||
+1
-1
@@ -200,7 +200,7 @@ public class RequestProcureCropList implements ClientPacket
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private final class CropHolder extends UniqueItemHolder
|
private class CropHolder extends UniqueItemHolder
|
||||||
{
|
{
|
||||||
private final int _manorId;
|
private final int _manorId;
|
||||||
private CropProcure _cp;
|
private CropProcure _cp;
|
||||||
|
|||||||
+1
-1
@@ -122,7 +122,7 @@ public class RequestRestartPoint implements ClientPacket
|
|||||||
portPlayer(player);
|
portPlayer(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final void portPlayer(Player player)
|
protected void portPlayer(Player player)
|
||||||
{
|
{
|
||||||
Location loc = null;
|
Location loc = null;
|
||||||
Instance instance = null;
|
Instance instance = null;
|
||||||
|
|||||||
+1
-1
@@ -69,7 +69,7 @@ public class ServerStatus extends WritablePacket
|
|||||||
public static final int ON = 0x01;
|
public static final int ON = 0x01;
|
||||||
public static final int OFF = 0x00;
|
public static final int OFF = 0x00;
|
||||||
|
|
||||||
static class Attribute
|
private static class Attribute
|
||||||
{
|
{
|
||||||
public int id;
|
public int id;
|
||||||
public int value;
|
public int value;
|
||||||
|
|||||||
+1
-1
@@ -48,7 +48,7 @@ public class ExSubjobInfo extends ServerPacket
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private final class SubInfo
|
private class SubInfo
|
||||||
{
|
{
|
||||||
private final int _index;
|
private final int _index;
|
||||||
private final int _classId;
|
private final int _classId;
|
||||||
|
|||||||
+1
-1
@@ -29,7 +29,7 @@ public class SkillList extends ServerPacket
|
|||||||
private final List<Skill> _skills = new ArrayList<>();
|
private final List<Skill> _skills = new ArrayList<>();
|
||||||
private int _lastLearnedSkillId = 0;
|
private int _lastLearnedSkillId = 0;
|
||||||
|
|
||||||
static class Skill
|
private static class Skill
|
||||||
{
|
{
|
||||||
public int id;
|
public int id;
|
||||||
public int reuseDelayGroup;
|
public int reuseDelayGroup;
|
||||||
|
|||||||
+1
-1
@@ -32,7 +32,7 @@ import javax.tools.StandardJavaFileManager;
|
|||||||
/**
|
/**
|
||||||
* @author HorridoJoho
|
* @author HorridoJoho
|
||||||
*/
|
*/
|
||||||
final class ScriptingFileManager implements StandardJavaFileManager
|
public class ScriptingFileManager implements StandardJavaFileManager
|
||||||
{
|
{
|
||||||
private final StandardJavaFileManager _wrapped;
|
private final StandardJavaFileManager _wrapped;
|
||||||
private final LinkedList<ScriptingOutputFileObject> _classOutputs = new LinkedList<>();
|
private final LinkedList<ScriptingOutputFileObject> _classOutputs = new LinkedList<>();
|
||||||
|
|||||||
+1
-1
@@ -31,7 +31,7 @@ import javax.tools.JavaFileObject;
|
|||||||
/**
|
/**
|
||||||
* @author HorridoJoho
|
* @author HorridoJoho
|
||||||
*/
|
*/
|
||||||
final class ScriptingOutputFileObject implements JavaFileObject
|
public class ScriptingOutputFileObject implements JavaFileObject
|
||||||
{
|
{
|
||||||
private final Path _sourcePath;
|
private final Path _sourcePath;
|
||||||
private final String _javaName;
|
private final String _javaName;
|
||||||
|
|||||||
@@ -250,7 +250,7 @@ public class Evolve
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static final class EvolveFeedWait implements Runnable
|
private static class EvolveFeedWait implements Runnable
|
||||||
{
|
{
|
||||||
private final Player _player;
|
private final Player _player;
|
||||||
private final Pet _petSummon;
|
private final Pet _petSummon;
|
||||||
@@ -282,7 +282,7 @@ public class Evolve
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static final class EvolveFinalizer implements Runnable
|
private static class EvolveFinalizer implements Runnable
|
||||||
{
|
{
|
||||||
private final Player _player;
|
private final Player _player;
|
||||||
private final Pet _petSummon;
|
private final Pet _petSummon;
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.ExServerPrimitive;
|
|||||||
/**
|
/**
|
||||||
* @author HorridoJoho
|
* @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)
|
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)
|
if (minionId == 0)
|
||||||
{
|
{
|
||||||
@@ -233,7 +233,7 @@ public class MinionList
|
|||||||
spawnMinion(_master, minionId);
|
spawnMinion(_master, minionId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final class MinionRespawnTask implements Runnable
|
private class MinionRespawnTask implements Runnable
|
||||||
{
|
{
|
||||||
private final Monster _minion;
|
private final Monster _minion;
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -73,7 +73,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
|
|||||||
return super.onAdvEvent(event, npc, player);
|
return super.onAdvEvent(event, npc, player);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class zoneInfo
|
private static class zoneInfo
|
||||||
{
|
{
|
||||||
private int currentPoints = 0;
|
private int currentPoints = 0;
|
||||||
private int currentMonitorizedDamage = 0;
|
private int currentMonitorizedDamage = 0;
|
||||||
@@ -121,7 +121,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class changeZoneStage implements Runnable
|
private static class changeZoneStage implements Runnable
|
||||||
{
|
{
|
||||||
private final ZoneType _zone;
|
private final ZoneType _zone;
|
||||||
|
|
||||||
|
|||||||
Vendored
+2
-2
@@ -437,7 +437,7 @@ public class Trandon extends AbstractNpcAI
|
|||||||
return "DualSkill-" + level;
|
return "DualSkill-" + level;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void takeSkills(Player player, String type)
|
private void takeSkills(Player player, String type)
|
||||||
{
|
{
|
||||||
final PlayerVariables vars = player.getVariables();
|
final PlayerVariables vars = player.getVariables();
|
||||||
final String list = vars.getString(type, "");
|
final String list = vars.getString(type, "");
|
||||||
@@ -455,7 +455,7 @@ public class Trandon extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void giveSkills(Player player, String type)
|
private void giveSkills(Player player, String type)
|
||||||
{
|
{
|
||||||
final String list = player.getVariables().getString(type, "");
|
final String list = player.getVariables().getString(type, "");
|
||||||
if (!list.isEmpty())
|
if (!list.isEmpty())
|
||||||
|
|||||||
+1
-1
@@ -768,7 +768,7 @@ public class Antharas extends AbstractNpcAI
|
|||||||
GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime);
|
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))
|
if ((attacker_1 != null) && (attacker == attacker_1))
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-2
@@ -621,12 +621,12 @@ public class Baium extends AbstractNpcAI
|
|||||||
return super.unload(removeFromList);
|
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);
|
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 newAggroVal = damage + getRandom(3000);
|
||||||
final int aggroVal = aggro + 1000;
|
final int aggroVal = aggro + 1000;
|
||||||
|
|||||||
+1
-1
@@ -178,7 +178,7 @@ public class CastleChamberlain extends AbstractNpcAI
|
|||||||
return "chamberlain-21.html";
|
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.getCastleFunction(func);
|
final CastleFunction function = castle.getCastleFunction(func);
|
||||||
if (function == null)
|
if (function == null)
|
||||||
|
|||||||
Vendored
+1
-1
@@ -1541,7 +1541,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
|||||||
activeChar.sendPacket(adminReply);
|
activeChar.sendPacket(adminReply);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final class IpPack
|
private class IpPack
|
||||||
{
|
{
|
||||||
String ip;
|
String ip;
|
||||||
int[][] tracert;
|
int[][] tracert;
|
||||||
|
|||||||
Vendored
+1
-1
@@ -77,7 +77,7 @@ public class AdminHtml implements IAdminCommandHandler
|
|||||||
* @param activeChar activeChar where html is shown
|
* @param activeChar activeChar where html is shown
|
||||||
* @param path relative path from directory data/html/admin/ to html
|
* @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);
|
showHtml(activeChar, "data/html/admin/" + path, false);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -110,7 +110,7 @@ public abstract class AbstractInstance extends AbstractNpcAI
|
|||||||
* @param npc NPC which allows to enter into instance
|
* @param npc NPC which allows to enter into instance
|
||||||
* @param templateId template ID of instance where player wants to enter
|
* @param templateId template ID of instance where player wants to enter
|
||||||
*/
|
*/
|
||||||
protected final void enterInstance(Player player, Npc npc, int templateId)
|
protected void enterInstance(Player player, Npc npc, int templateId)
|
||||||
{
|
{
|
||||||
Instance instance = getPlayerInstance(player);
|
Instance instance = getPlayerInstance(player);
|
||||||
if (instance != null) // Player has already any instance active
|
if (instance != null) // Player has already any instance active
|
||||||
|
|||||||
+1
-1
@@ -568,7 +568,7 @@ public class Kamaloka extends AbstractInstance
|
|||||||
* Spawn all NPCs in kamaloka
|
* Spawn all NPCs in kamaloka
|
||||||
* @param world instanceWorld
|
* @param world instanceWorld
|
||||||
*/
|
*/
|
||||||
private final void spawnKama(Instance world)
|
private void spawnKama(Instance world)
|
||||||
{
|
{
|
||||||
int[] npcs;
|
int[] npcs;
|
||||||
int[][] spawns;
|
int[][] spawns;
|
||||||
|
|||||||
+1
-1
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.util.Util;
|
|||||||
*/
|
*/
|
||||||
public class Q00371_ShrieksOfGhosts extends Quest
|
public class Q00371_ShrieksOfGhosts extends Quest
|
||||||
{
|
{
|
||||||
private static final class DropInfo
|
private static class DropInfo
|
||||||
{
|
{
|
||||||
public int _firstChance;
|
public int _firstChance;
|
||||||
public int _secondChance;
|
public int _secondChance;
|
||||||
|
|||||||
+1
-1
@@ -449,7 +449,7 @@ public class Q00373_SupplierOfReagents extends Quest
|
|||||||
return htmltext;
|
return htmltext;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class Entry
|
private static class Entry
|
||||||
{
|
{
|
||||||
private final int item;
|
private final int item;
|
||||||
private final String html;
|
private final String html;
|
||||||
|
|||||||
+1
-1
@@ -483,7 +483,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
|
|||||||
return player.getInventory().getItemByItemId(fluteItemId);
|
return player.getInventory().getItemByItemId(fluteItemId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class NpcData
|
private static class NpcData
|
||||||
{
|
{
|
||||||
public NpcStringId message;
|
public NpcStringId message;
|
||||||
public int memoStateMod;
|
public int memoStateMod;
|
||||||
|
|||||||
+1
-1
@@ -486,7 +486,7 @@ public class Q00663_SeductiveWhispers extends Quest
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class Card
|
private static class Card
|
||||||
{
|
{
|
||||||
private final int _number;
|
private final int _number;
|
||||||
private final Side _side;
|
private final Side _side;
|
||||||
|
|||||||
+2
-2
@@ -42,7 +42,7 @@ import ai.AbstractNpcAI;
|
|||||||
|
|
||||||
public abstract class AirShipController extends AbstractNpcAI
|
public abstract class AirShipController extends AbstractNpcAI
|
||||||
{
|
{
|
||||||
private final class DecayTask implements Runnable
|
private class DecayTask implements Runnable
|
||||||
{
|
{
|
||||||
public DecayTask()
|
public DecayTask()
|
||||||
{
|
{
|
||||||
@@ -58,7 +58,7 @@ public abstract class AirShipController extends AbstractNpcAI
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private final class DepartTask implements Runnable
|
private class DepartTask implements Runnable
|
||||||
{
|
{
|
||||||
public DepartTask()
|
public DepartTask()
|
||||||
{
|
{
|
||||||
|
|||||||
+2
-2
@@ -119,7 +119,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
|
|||||||
_ship.runEngine(60000);
|
_ship.runEngine(60000);
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void broadcastInGludio(NpcStringId npcString)
|
private void broadcastInGludio(NpcStringId npcString)
|
||||||
{
|
{
|
||||||
if (!_foundAtcGludio)
|
if (!_foundAtcGludio)
|
||||||
{
|
{
|
||||||
@@ -132,7 +132,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void broadcastInGracia(NpcStringId npcStringId)
|
private void broadcastInGracia(NpcStringId npcStringId)
|
||||||
{
|
{
|
||||||
if (!_foundAtcGracia)
|
if (!_foundAtcGracia)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -514,7 +514,7 @@ public class Shutdown extends Thread
|
|||||||
* A simple class used to track down the estimated time of method executions.<br>
|
* 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.
|
* 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;
|
private long _startTime;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.stats.Stat;
|
|||||||
/**
|
/**
|
||||||
* @author Sahar
|
* @author Sahar
|
||||||
*/
|
*/
|
||||||
public final class PaperdollCache
|
public class PaperdollCache
|
||||||
{
|
{
|
||||||
private final Set<Item> _paperdollItems = ConcurrentHashMap.newKeySet();
|
private final Set<Item> _paperdollItems = ConcurrentHashMap.newKeySet();
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.cache;
|
|||||||
/**
|
/**
|
||||||
* @author Sahar
|
* @author Sahar
|
||||||
*/
|
*/
|
||||||
public final class RelationCache
|
public class RelationCache
|
||||||
{
|
{
|
||||||
private final int _relation;
|
private final int _relation;
|
||||||
private final boolean _isAutoAttackable;
|
private final boolean _isAutoAttackable;
|
||||||
|
|||||||
@@ -474,7 +474,7 @@ public class BotReportTable
|
|||||||
/**
|
/**
|
||||||
* Represents the info about a reporter
|
* Represents the info about a reporter
|
||||||
*/
|
*/
|
||||||
private final class ReporterCharData
|
private class ReporterCharData
|
||||||
{
|
{
|
||||||
private long _lastReport;
|
private long _lastReport;
|
||||||
private byte _reportPoints;
|
private byte _reportPoints;
|
||||||
@@ -510,7 +510,7 @@ public class BotReportTable
|
|||||||
/**
|
/**
|
||||||
* Represents the info about a reported character
|
* Represents the info about a reported character
|
||||||
*/
|
*/
|
||||||
private final class ReportedCharData
|
private class ReportedCharData
|
||||||
{
|
{
|
||||||
Map<Integer, Long> _reporters;
|
Map<Integer, Long> _reporters;
|
||||||
|
|
||||||
@@ -556,7 +556,7 @@ public class BotReportTable
|
|||||||
/**
|
/**
|
||||||
* SAX loader to parse /config/BotReportPunishments.xml file
|
* SAX loader to parse /config/BotReportPunishments.xml file
|
||||||
*/
|
*/
|
||||||
private final class PunishmentsLoader extends DefaultHandler
|
private class PunishmentsLoader extends DefaultHandler
|
||||||
{
|
{
|
||||||
PunishmentsLoader()
|
PunishmentsLoader()
|
||||||
{
|
{
|
||||||
@@ -622,7 +622,7 @@ public class BotReportTable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
static final BotReportTable INSTANCE = new BotReportTable();
|
static final BotReportTable INSTANCE = new BotReportTable();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -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)))
|
if ((name != null) && !name.equals(_chars.get(objectId)))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ public class SayuneData implements IXmlReader
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void parseEntries(SayuneEntry lastEntry, Node n)
|
private void parseEntries(SayuneEntry lastEntry, Node n)
|
||||||
{
|
{
|
||||||
NamedNodeMap attrs;
|
NamedNodeMap attrs;
|
||||||
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
|
for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling())
|
||||||
|
|||||||
@@ -386,7 +386,7 @@ public enum ClassId implements IIdentifiable
|
|||||||
return _nextClassIds;
|
return _nextClassIds;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void addNextClassId(ClassId cId)
|
private void addNextClassId(ClassId cId)
|
||||||
{
|
{
|
||||||
_nextClassIds.add(cId);
|
_nextClassIds.add(cId);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.geoengine.geodata;
|
|||||||
/**
|
/**
|
||||||
* @author HorridoJoho
|
* @author HorridoJoho
|
||||||
*/
|
*/
|
||||||
public final class Cell
|
public class Cell
|
||||||
{
|
{
|
||||||
/** East NSWE flag */
|
/** East NSWE flag */
|
||||||
public static final byte NSWE_EAST = 1 << 0;
|
public static final byte NSWE_EAST = 1 << 0;
|
||||||
|
|||||||
+1
-1
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.regions.Region;
|
|||||||
/**
|
/**
|
||||||
* @author HorridoJoho
|
* @author HorridoJoho
|
||||||
*/
|
*/
|
||||||
public final class GeoData
|
public class GeoData
|
||||||
{
|
{
|
||||||
// world dimensions: 1048576 * 1048576 = 1099511627776
|
// world dimensions: 1048576 * 1048576 = 1099511627776
|
||||||
private static final int WORLD_MIN_X = -655360;
|
private static final int WORLD_MIN_X = -655360;
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.IBlock;
|
|||||||
/**
|
/**
|
||||||
* @author HorridoJoho
|
* @author HorridoJoho
|
||||||
*/
|
*/
|
||||||
public final class ComplexBlock implements IBlock
|
public class ComplexBlock implements IBlock
|
||||||
{
|
{
|
||||||
private final short[] _data;
|
private final short[] _data;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.IRegion;
|
|||||||
/**
|
/**
|
||||||
* @author HorridoJoho
|
* @author HorridoJoho
|
||||||
*/
|
*/
|
||||||
public final class NullRegion implements IRegion
|
public class NullRegion implements IRegion
|
||||||
{
|
{
|
||||||
public static final NullRegion INSTANCE = new NullRegion();
|
public static final NullRegion INSTANCE = new NullRegion();
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.blocks.MultilayerBlock;
|
|||||||
/**
|
/**
|
||||||
* @author HorridoJoho
|
* @author HorridoJoho
|
||||||
*/
|
*/
|
||||||
public final class Region implements IRegion
|
public class Region implements IRegion
|
||||||
{
|
{
|
||||||
private final IBlock[] _blocks = new IBlock[IRegion.REGION_BLOCKS];
|
private final IBlock[] _blocks = new IBlock[IRegion.REGION_BLOCKS];
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -85,7 +85,7 @@ public class CellNodeBuffer
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public final void free()
|
public void free()
|
||||||
{
|
{
|
||||||
_current = null;
|
_current = null;
|
||||||
|
|
||||||
@@ -136,7 +136,7 @@ public class CellNodeBuffer
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void getNeighbors()
|
private void getNeighbors()
|
||||||
{
|
{
|
||||||
if (_current.getLoc().canGoNone())
|
if (_current.getLoc().canGoNone())
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ public class ConditionHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final ConditionHandler INSTANCE = new ConditionHandler();
|
protected static final ConditionHandler INSTANCE = new ConditionHandler();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ public class EffectHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final EffectHandler INSTANCE = new EffectHandler();
|
protected static final EffectHandler INSTANCE = new EffectHandler();
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -58,7 +58,7 @@ public class SkillConditionHandler
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
protected static final SkillConditionHandler INSTANCE = new SkillConditionHandler();
|
protected static final SkillConditionHandler INSTANCE = new SkillConditionHandler();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -243,7 +243,7 @@ public class PetData
|
|||||||
return _skills;
|
return _skills;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final class PetSkillLearn extends SkillHolder
|
public static class PetSkillLearn extends SkillHolder
|
||||||
{
|
{
|
||||||
private final int _minLevel;
|
private final int _minLevel;
|
||||||
|
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
|
|||||||
* Sets the instance type.
|
* Sets the instance type.
|
||||||
* @param newInstanceType the instance type to set
|
* @param newInstanceType the instance type to set
|
||||||
*/
|
*/
|
||||||
protected final void setInstanceType(InstanceType newInstanceType)
|
protected void setInstanceType(InstanceType newInstanceType)
|
||||||
{
|
{
|
||||||
_instanceType = newInstanceType;
|
_instanceType = newInstanceType;
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -307,7 +307,7 @@ public class Attackable extends Npc
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static class PartyContainer
|
private static class PartyContainer
|
||||||
{
|
{
|
||||||
public Party party;
|
public Party party;
|
||||||
public long damage;
|
public long damage;
|
||||||
|
|||||||
@@ -2205,7 +2205,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
return _isRunning;
|
return _isRunning;
|
||||||
}
|
}
|
||||||
|
|
||||||
private final void setRunning(boolean value)
|
private void setRunning(boolean value)
|
||||||
{
|
{
|
||||||
if (_isRunning == value)
|
if (_isRunning == value)
|
||||||
{
|
{
|
||||||
@@ -2396,7 +2396,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>.
|
* 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
|
* @param template
|
||||||
*/
|
*/
|
||||||
protected final void setTemplate(CreatureTemplate template)
|
protected void setTemplate(CreatureTemplate template)
|
||||||
{
|
{
|
||||||
_template = template;
|
_template = template;
|
||||||
}
|
}
|
||||||
@@ -5657,7 +5657,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
return MoveType.STANDING;
|
return MoveType.STANDING;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final void computeStatusUpdate(StatusUpdate su, StatusUpdateType type)
|
protected void computeStatusUpdate(StatusUpdate su, StatusUpdateType type)
|
||||||
{
|
{
|
||||||
final int newValue = type.getValue(this);
|
final int newValue = type.getValue(this);
|
||||||
_statusUpdates.compute(type, (key, oldValue) ->
|
_statusUpdates.compute(type, (key, oldValue) ->
|
||||||
@@ -5671,7 +5671,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final void addStatusUpdateValue(StatusUpdateType type)
|
protected void addStatusUpdateValue(StatusUpdateType type)
|
||||||
{
|
{
|
||||||
_statusUpdates.put(type, type.getValue(this));
|
_statusUpdates.put(type, type.getValue(this));
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -297,7 +297,7 @@ public class ControllableAirShip extends AirShip
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final class ConsumeFuelTask implements Runnable
|
protected class ConsumeFuelTask implements Runnable
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
@@ -317,7 +317,7 @@ public class ControllableAirShip extends AirShip
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final class CheckTask implements Runnable
|
protected class CheckTask implements Runnable
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
@@ -330,7 +330,7 @@ public class ControllableAirShip extends AirShip
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected final class DecayTask implements Runnable
|
protected class DecayTask implements Runnable
|
||||||
{
|
{
|
||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
|
|||||||
+2
-2
@@ -56,7 +56,7 @@ public class FortDoorman extends Doorman
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void openDoors(Player player, String command)
|
protected void openDoors(Player player, String command)
|
||||||
{
|
{
|
||||||
final StringTokenizer st = new StringTokenizer(command.substring(10), ", ");
|
final StringTokenizer st = new StringTokenizer(command.substring(10), ", ");
|
||||||
st.nextToken();
|
st.nextToken();
|
||||||
@@ -68,7 +68,7 @@ public class FortDoorman extends Doorman
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected final void closeDoors(Player player, String command)
|
protected void closeDoors(Player player, String command)
|
||||||
{
|
{
|
||||||
final StringTokenizer st = new StringTokenizer(command.substring(11), ", ");
|
final StringTokenizer st = new StringTokenizer(command.substring(11), ", ");
|
||||||
st.nextToken();
|
st.nextToken();
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user