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

Code style changes.

Browse Source
This commit is contained in:
MobiusDev
2016-04-26 19:21:19 +00:00
parent 6a13705766
commit fc070c9238
768 changed files with 3338 additions and 4252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
trunk/java/com/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@ -160,7 +160,7 @@ public abstract class AbstractOlympiadGame
return null;
}
protected static final boolean portPlayerToArena(Participant par, Location loc, int id)
protected static boolean portPlayerToArena(Participant par, Location loc, int id)
{
final L2PcInstance player = par.getPlayer();
if ((player == null) || !player.isOnline())
@ -194,7 +194,7 @@ public abstract class AbstractOlympiadGame
return true;
}
protected static final void removals(L2PcInstance player, boolean removeParty)
protected static void removals(L2PcInstance player, boolean removeParty)
{
try
{
@ -297,7 +297,7 @@ public abstract class AbstractOlympiadGame
}
}
protected static final void cleanEffects(L2PcInstance player)
protected static void cleanEffects(L2PcInstance player)
{
try
{
@ -350,7 +350,7 @@ public abstract class AbstractOlympiadGame
}
}
protected static final void playerStatusBack(L2PcInstance player)
protected static void playerStatusBack(L2PcInstance player)
{
try
{
@ -401,7 +401,7 @@ public abstract class AbstractOlympiadGame
}
}
protected static final void portPlayerBack(L2PcInstance player)
protected static void portPlayerBack(L2PcInstance player)
{
if (player == null)
{
@ -418,7 +418,7 @@ public abstract class AbstractOlympiadGame
player.unsetLastLocation();
}
public static final void rewardParticipant(L2PcInstance player, int[][] reward)
public static void rewardParticipant(L2PcInstance player, int[][] reward)
{
if ((player == null) || !player.isOnline() || (reward == null))
{

50
trunk/java/com/l2jmobius/gameserver/model/olympiad/Olympiad.java
View File

@ -549,7 +549,7 @@ public class Olympiad extends ListenersContainer
private long getMillisToOlympiadEnd()
{
// if (_olympiadEnd > Calendar.getInstance().getTimeInMillis())
return (_olympiadEnd - Calendar.getInstance().getTimeInMillis());
return _olympiadEnd - Calendar.getInstance().getTimeInMillis();
// return 10L;
}
@ -567,14 +567,14 @@ public class Olympiad extends ListenersContainer
{
if (_validationEnd > Calendar.getInstance().getTimeInMillis())
{
return (_validationEnd - Calendar.getInstance().getTimeInMillis());
return _validationEnd - Calendar.getInstance().getTimeInMillis();
}
return 10L;
}
public boolean isOlympiadEnd()
{
return (_period != 0);
return _period != 0;
}
protected void setNewOlympiadEnd()
@ -612,7 +612,7 @@ public class Olympiad extends ListenersContainer
if (_compStart.getTimeInMillis() > Calendar.getInstance().getTimeInMillis())
{
return (_compStart.getTimeInMillis() - Calendar.getInstance().getTimeInMillis());
return _compStart.getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
}
return setNewCompBegin();
@ -628,13 +628,13 @@ public class Olympiad extends ListenersContainer
_log.info("Olympiad System: New Schedule @ " + _compStart.getTime());
return (_compStart.getTimeInMillis() - Calendar.getInstance().getTimeInMillis());
return _compStart.getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
}
protected long getMillisToCompEnd()
{
// if (_compEnd > Calendar.getInstance().getTimeInMillis())
return (_compEnd - Calendar.getInstance().getTimeInMillis());
return _compEnd - Calendar.getInstance().getTimeInMillis();
// return 10L;
}
@ -642,7 +642,7 @@ public class Olympiad extends ListenersContainer
{
if (_nextWeeklyChange > Calendar.getInstance().getTimeInMillis())
{
return (_nextWeeklyChange - Calendar.getInstance().getTimeInMillis());
return _nextWeeklyChange - Calendar.getInstance().getTimeInMillis();
}
return 10L;
}
@ -707,7 +707,7 @@ public class Olympiad extends ListenersContainer
public boolean playerInStadia(L2PcInstance player)
{
return (ZoneManager.getInstance().getOlympiadStadium(player) != null);
return ZoneManager.getInstance().getOlympiadStadium(player) != null;
}
/**
@ -964,27 +964,21 @@ public class Olympiad extends ListenersContainer
{
winner = hero2;
}
else if (hero1Comps > hero2Comps)
{
winner = hero1;
}
else if (hero2Comps > hero1Comps)
{
winner = hero2;
}
else if (hero1Wins > hero2Wins)
{
winner = hero1;
}
else
{
if (hero1Comps > hero2Comps)
{
winner = hero1;
}
else if (hero2Comps > hero1Comps)
{
winner = hero2;
}
else
{
if (hero1Wins > hero2Wins)
{
winner = hero1;
}
else
{
winner = hero2;
}
}
winner = hero2;
}
hero.set(CLASS_ID, winner.getInt(CLASS_ID));
@ -1052,7 +1046,7 @@ public class Olympiad extends ListenersContainer
}
final int rank = NOBLES_RANK.get(objId);
int points = (player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0);
int points = player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? Config.ALT_OLY_HERO_POINTS : 0;
switch (rank)
{
case 1:

2
trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameClassed.java
View File

@ -55,7 +55,7 @@ public class OlympiadGameClassed extends OlympiadGameNormal
return COMP_DONE_WEEK_CLASSED;
}
protected static final OlympiadGameClassed createGame(int id, List<List<Integer>> classList)
protected static OlympiadGameClassed createGame(int id, List<List<Integer>> classList)
{
if ((classList == null) || classList.isEmpty())
{

15
trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameManager.java
View File

@ -53,7 +53,7 @@ public class OlympiadGameManager implements Runnable
_log.log(Level.INFO, "Olympiad System: Loaded " + _tasks.length + " stadiums.");
}
public static final OlympiadGameManager getInstance()
public static OlympiadGameManager getInstance()
{
return SingletonHolder._instance;
}
@ -145,15 +145,12 @@ public class OlympiadGameManager implements Runnable
}
}
}
else
// not in competition period
else if (isAllTasksFinished())
{
// not in competition period
if (isAllTasksFinished())
{
OlympiadManager.getInstance().clearRegistered();
_battleStarted = false;
_log.log(Level.INFO, "Olympiad System: All current games finished.");
}
OlympiadManager.getInstance().clearRegistered();
_battleStarted = false;
_log.log(Level.INFO, "Olympiad System: All current games finished.");
}
}

2
trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNonClassed.java
View File

@ -54,7 +54,7 @@ public class OlympiadGameNonClassed extends OlympiadGameNormal
return COMP_DONE_WEEK_NON_CLASSED;
}
protected static final OlympiadGameNonClassed createGame(int id, List<Integer> list)
protected static OlympiadGameNonClassed createGame(int id, List<Integer> list)
{
final Participant[] opponents = OlympiadGameNormal.createListOfParticipants(list);
return opponents == null ? null : new OlympiadGameNonClassed(id, opponents);

12
trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java
View File

@ -62,7 +62,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
_playerTwo.getPlayer().setOlympiadGameId(id);
}
protected static final Participant[] createListOfParticipants(List<Integer> list)
protected static Participant[] createListOfParticipants(List<Integer> list)
{
if ((list == null) || list.isEmpty() || (list.size() < 2))
{
@ -319,8 +319,8 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
final List<OlympiadInfo> list1 = new ArrayList<>(1);
final List<OlympiadInfo> list2 = new ArrayList<>(1);
final boolean _pOneCrash = ((_playerOne.getPlayer() == null) || _playerOne.isDisconnected());
final boolean _pTwoCrash = ((_playerTwo.getPlayer() == null) || _playerTwo.isDisconnected());
final boolean _pOneCrash = (_playerOne.getPlayer() == null) || _playerOne.isDisconnected();
final boolean _pTwoCrash = (_playerTwo.getPlayer() == null) || _playerTwo.isDisconnected();
final int playerOnePoints = _playerOne.getStats().getInt(POINTS);
final int playerTwoPoints = _playerTwo.getStats().getInt(POINTS);
@ -577,7 +577,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
String winner = "draw";
// Calculate Fight time
final long _fightTime = (System.currentTimeMillis() - _startTime);
final long _fightTime = System.currentTimeMillis() - _startTime;
double playerOneHp = 0;
if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead())
@ -784,7 +784,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
_damageP2 = 0;
}
protected static final void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type)
protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type)
{
try (Connection con = DatabaseFactory.getInstance().getConnection();
PreparedStatement ps = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)"))
@ -796,7 +796,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
ps.setInt(5, winner);
ps.setLong(6, startTime);
ps.setLong(7, fightTime);
ps.setInt(8, (type == CompetitionType.CLASSED ? 1 : 0));
ps.setInt(8, type == CompetitionType.CLASSED ? 1 : 0);
ps.execute();
}
catch (SQLException e)

4
trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadGameTeams.java
View File

@ -94,7 +94,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
}
}
protected static final Participant[][] createListOfParticipants(List<List<Integer>> list)
protected static Participant[][] createListOfParticipants(List<List<Integer>> list)
{
if ((list == null) || list.isEmpty() || (list.size() < 2))
{
@ -111,7 +111,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
{
teamOne = list.remove(Rnd.nextInt(list.size()));
if (((teamOne == null) || teamOne.isEmpty()))
if ((teamOne == null) || teamOne.isEmpty())
{
continue;
}

2
trunk/java/com/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
View File

@ -49,7 +49,7 @@ public class OlympiadManager
_teamsBasedRegisters = new CopyOnWriteArrayList<>();
}
public static final OlympiadManager getInstance()
public static OlympiadManager getInstance()
{
return SingletonHolder._instance;
}

2
trunk/java/com/l2jmobius/gameserver/model/olympiad/Participant.java
View File

@ -70,7 +70,7 @@ public final class Participant
{
player = L2World.getInstance().getPlayer(getObjectId());
}
return (player != null);
return player != null;
}
/**