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

Proper modifier order and removal if implied by their context.

Browse Source
This commit is contained in:
MobiusDev
2018-06-19 02:02:54 +00:00
parent 61b336acb9
commit a5b69096dd
163 changed files with 325 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java vendored
View File

@@ -77,7 +77,7 @@ public final class SelMahumDrill extends AbstractNpcAI
// Chiefs event broadcast range
private static final int TRAINING_RANGE = 1000;
private static enum Actions
private enum Actions
{
SCE_TRAINING_ACTION_A(4, -1, 2, 2333),
SCE_TRAINING_ACTION_B(1, -1, 2, 4333),

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Helios/Helios.java vendored
View File

@@ -41,7 +41,7 @@ public class Helios extends AbstractNpcAI
// Location
private static final Location HELIOS_SPAWN_LOC = new Location(92771, 161909, 3494, 38329);
// Zone
private final static int ZONE_ID = 210109;
private static final int ZONE_ID = 210109;
// Status
private static final int ALIVE = 0;
private static final int WAITING = 1;

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/Lindvior.java vendored
View File

@@ -85,7 +85,7 @@ public class Lindvior extends AbstractNpcAI
private static final int LIONEL_HUNTER = 33886;
private static final int LINDVIOR_CAMERA = 19428;
// Zone
private final static int ZONE_ID = 12107;
private static final int ZONE_ID = 12107;
static final Location CENTER_LOCATION = new Location(46424, -26200, -1400);
// Skills
private static final SkillHolder SKILL_RECHARGE_POSIBLE = new SkillHolder(15605, 1);

18
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Lindvior/LindviorBoss.java vendored
View File

@@ -48,15 +48,15 @@ public class LindviorBoss extends AbstractNpcAI
private static final SkillHolder TORNADO = new SkillHolder(15275, 1);
private static final SkillHolder LINDVIORS_ATTACK = new SkillHolder(15600, 1);
// Chances
private final static int CHANCE_MIGHTY_WIND_STRIKE = 9;
private final static int CHANCE_WIND_PULL = 4;
private final static int CHANCE_LINDVIORS_JUMP = 7;
private final static int CHANCE_BODY_SLAM = 2;
private final static int CHANCE_SOAR = 8;
private final static int CHANCE_WIND_BREAT = 3;
private final static int CHANCE_TAIL_SWIPE = 5;
private final static int CHANCE_TORNADO = 6;
private final static int CHANCE_LINDVIORS_ATTACK = 1;
private static final int CHANCE_MIGHTY_WIND_STRIKE = 9;
private static final int CHANCE_WIND_PULL = 4;
private static final int CHANCE_LINDVIORS_JUMP = 7;
private static final int CHANCE_BODY_SLAM = 2;
private static final int CHANCE_SOAR = 8;
private static final int CHANCE_WIND_BREAT = 3;
private static final int CHANCE_TAIL_SWIPE = 5;
private static final int CHANCE_TORNADO = 6;
private static final int CHANCE_LINDVIORS_ATTACK = 1;
public LindviorBoss()
{

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Sailren/Sailren.java vendored
View File

@@ -56,7 +56,7 @@ public final class Sailren extends AbstractNpcAI
private static int _killCount = 0;
private static long _lastAttack = 0;
private static enum Status
private enum Status
{
ALIVE,
IN_FIGHT,

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/custom/events/Elpies/Elpies.java vendored
View File

@@ -177,7 +177,7 @@ public final class Elpies extends Event
return super.onSpawn(npc);
}
private static enum EventLocation
private enum EventLocation
{
ADEN("Aden", 146558, 148341, 26622, 28560, -2200),
DION("Dion", 18564, 19200, 144377, 145782, -3081),

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/Rnd.java
View File

@@ -191,7 +191,7 @@ public final class Rnd
/**
* @author Forsaiken
*/
public static enum RandomType
public enum RandomType
{
/**
* For best random quality.

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/geodata/BlockComplexDynamic.java
View File

@@ -151,7 +151,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn
}
@Override
final synchronized public void addGeoObject(IGeoObject object)
public final synchronized void addGeoObject(IGeoObject object)
{
// add geo object, update block geodata when added
if (_objects.add(object))
@@ -161,7 +161,7 @@ public final class BlockComplexDynamic extends BlockComplex implements IBlockDyn
}
@Override
final synchronized public void removeGeoObject(IGeoObject object)
public final synchronized void removeGeoObject(IGeoObject object)
{
// remove geo object, update block geodata when removed
if (_objects.remove(object))

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/geoengine/geodata/BlockMultilayerDynamic.java
View File

@@ -196,7 +196,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl
}
@Override
final synchronized public void addGeoObject(IGeoObject object)
public final synchronized void addGeoObject(IGeoObject object)
{
// add geo object, update block geodata when added
if (_objects.add(object))
@@ -206,7 +206,7 @@ public final class BlockMultilayerDynamic extends BlockMultilayer implements IBl
}
@Override
final synchronized public void removeGeoObject(IGeoObject object)
public final synchronized void removeGeoObject(IGeoObject object)
{
// remove geo object, update block geodata when removed
if (_objects.remove(object))

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/DBSpawnManager.java
View File

@@ -55,7 +55,7 @@ public class DBSpawnManager
protected final Map<Integer, StatsSet> _storedInfo = new ConcurrentHashMap<>();
protected final Map<Integer, ScheduledFuture<?>> _schedules = new ConcurrentHashMap<>();
public static enum DBStatusType
public enum DBStatusType
{
ALIVE,
DEAD,

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/PlayerCountManager.java
View File

@@ -21,9 +21,9 @@ package com.l2jmobius.gameserver.instancemanager;
*/
public class PlayerCountManager
{
private volatile static int connectedCount = 0;
private volatile static int maxConnectedCount = 0;
private volatile static int offlineTradeCount = 0;
private static volatile int connectedCount = 0;
private static volatile int maxConnectedCount = 0;
private static volatile int offlineTradeCount = 0;
protected PlayerCountManager()
{

8
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -835,12 +835,12 @@ public final class L2PcInstance extends L2Playable
}
// Training Camp
private final static String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private final static String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION";
private static final String TRAINING_CAMP_VAR = "TRAINING_CAMP";
private static final String TRAINING_CAMP_DURATION = "TRAINING_CAMP_DURATION";
// Attendance Reward system
private final static String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE";
private final static String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX";
private static final String ATTENDANCE_DATE_VAR = "ATTENDANCE_DATE";
private static final String ATTENDANCE_INDEX_VAR = "ATTENDANCE_INDEX";
// Save responder name for log it
private String _lastPetitionGmName = null;

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/cubic/conditions/HpCondition.java
View File

@@ -62,7 +62,7 @@ public class HpCondition implements ICubicCondition
return getClass().getSimpleName() + " chance: " + _hpPer;
}
public static enum HpConditionType
public enum HpConditionType
{
GREATER,
LESSER;

10
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/LuckyGameDataHolder.java
View File

@@ -26,11 +26,11 @@ import com.l2jmobius.gameserver.model.StatsSet;
*/
public class LuckyGameDataHolder
{
final private int _index;
final private int _turningPoints;
final private List<ItemChanceHolder> _commonRewards = new ArrayList<>();
final private List<ItemPointHolder> _uniqueRewards = new ArrayList<>();
final private List<ItemChanceHolder> _modifyRewards = new ArrayList<>();
private final int _index;
private final int _turningPoints;
private final List<ItemChanceHolder> _commonRewards = new ArrayList<>();
private final List<ItemPointHolder> _uniqueRewards = new ArrayList<>();
private final List<ItemChanceHolder> _modifyRewards = new ArrayList<>();
private int _minModifyRewardGame;
private int _maxModifyRewardGame;

8
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/Gui.java
View File

@@ -62,22 +62,22 @@ public class Gui
{
JTextArea txtrConsole;
final static String[] shutdownOptions =
static final String[] shutdownOptions =
{
"Shutdown",
"Cancel"
};
final static String[] restartOptions =
static final String[] restartOptions =
{
"Restart",
"Cancel"
};
final static String[] abortOptions =
static final String[] abortOptions =
{
"Abort",
"Cancel"
};
final static String[] confirmOptions =
static final String[] confirmOptions =
{
"Confirm",
"Cancel"

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/SystemPanel.java
View File

@@ -39,7 +39,7 @@ import com.l2jmobius.gameserver.util.Locator;
*/
public class SystemPanel extends JPanel
{
final static long startTime = System.currentTimeMillis();
static final long startTime = System.currentTimeMillis();
public SystemPanel()
{

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/ui/frmAbout.java
View File

@@ -39,7 +39,7 @@ import com.l2jmobius.Config;
public class frmAbout
{
private JFrame frmAbout;
final static String URL = "www.l2jmobius.com";
static final String URL = "www.l2jmobius.com";
URI uri;
public frmAbout()

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/Util.java
View File

@@ -695,8 +695,8 @@ public final class Util
{
final StringBuilder sb = new StringBuilder();
try (InputStream in = new FileInputStream(file);
final InputStreamReader reader = new InputStreamReader(in, cs);
final BufferedReader buffer = new BufferedReader(reader))
InputStreamReader reader = new InputStreamReader(in, cs);
BufferedReader buffer = new BufferedReader(reader))
{
String line;
while ((line = buffer.readLine()) != null)

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java
View File

@@ -511,7 +511,7 @@ public class SchedulingPattern
/**
* Definition for a value parser.
*/
private static interface ValueParser
private interface ValueParser
{
/**
* Attempts to parse a value.

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/ui/Gui.java
View File

@@ -61,12 +61,12 @@ public class Gui
JCheckBoxMenuItem chckbxmntmDisabled;
JCheckBoxMenuItem chckbxmntmGmOnly;
final static String[] shutdownOptions =
static final String[] shutdownOptions =
{
"Shutdown",
"Cancel"
};
final static String[] restartOptions =
static final String[] restartOptions =
{
"Restart",
"Cancel"

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/loginserver/ui/frmAbout.java
View File

@@ -37,7 +37,7 @@ import javax.swing.WindowConstants;
public class frmAbout
{
private JFrame frmAbout;
final static String URL = "www.l2jmobius.com";
static final String URL = "www.l2jmobius.com";
URI uri;
public frmAbout()