More final and static cleanups.

This commit is contained in:
MobiusDevelopment
2019-08-01 09:43:44 +00:00
parent 406caf063a
commit 565933653d
454 changed files with 757 additions and 757 deletions

View File

@@ -497,7 +497,7 @@ public class GameServer
INSTANCE = new GameServer();
}
private static void printSection(String s)
private void printSection(String s)
{
s = "=[ " + s + " ]";
while (s.length() < 61)

View File

@@ -395,7 +395,7 @@ public class ClanEntryManager
return _clanLocked.get(playerId) == null ? 0 : _clanLocked.get(playerId).getDelay(TimeUnit.MINUTES);
}
private static void lockPlayer(int playerId)
private void lockPlayer(int playerId)
{
_playerLocked.put(playerId, ThreadPool.schedule(() ->
{
@@ -403,7 +403,7 @@ public class ClanEntryManager
}, LOCK_TIME));
}
private static void lockClan(int clanId)
private void lockClan(int clanId)
{
_clanLocked.put(clanId, ThreadPool.schedule(() ->
{

View File

@@ -296,7 +296,7 @@ public class VillageMasterInstance extends NpcInstance
}
}
private static void dissolveClan(PlayerInstance player, int clanId)
private void dissolveClan(PlayerInstance player, int clanId)
{
if (!player.isClanLeader())
{
@@ -357,7 +357,7 @@ public class VillageMasterInstance extends NpcInstance
ClanTable.getInstance().scheduleRemoveClan(clan.getId());
}
private static void recoverClan(PlayerInstance player, int clanId)
private void recoverClan(PlayerInstance player, int clanId)
{
if (!player.isClanLeader())
{
@@ -370,7 +370,7 @@ public class VillageMasterInstance extends NpcInstance
clan.updateClanInDB();
}
private static void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl)
private void createSubPledge(PlayerInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl)
{
if (!player.isClanLeader())
{
@@ -480,7 +480,7 @@ public class VillageMasterInstance extends NpcInstance
}
}
private static void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName)
private void renameSubPledge(PlayerInstance player, int pledgeType, String pledgeName)
{
if (!player.isClanLeader())
{
@@ -513,7 +513,7 @@ public class VillageMasterInstance extends NpcInstance
player.sendMessage("Pledge name changed.");
}
private static void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName)
private void assignSubPledgeLeader(PlayerInstance player, String clanName, String leaderName)
{
if (!player.isClanLeader())
{

View File

@@ -2629,7 +2629,7 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
* @param player
* @param holder
*/
protected static void giveItems(PlayerInstance player, ItemHolder holder)
protected void giveItems(PlayerInstance player, ItemHolder holder)
{
giveItems(player, holder.getId(), holder.getCount());
}

View File

@@ -192,7 +192,7 @@ public abstract class AbstractOlympiadGame
return true;
}
protected static void removals(PlayerInstance player, boolean removeParty)
protected void removals(PlayerInstance player, boolean removeParty)
{
try
{
@@ -291,7 +291,7 @@ public abstract class AbstractOlympiadGame
}
}
protected static void cleanEffects(PlayerInstance player)
protected void cleanEffects(PlayerInstance player)
{
try
{
@@ -344,7 +344,7 @@ public abstract class AbstractOlympiadGame
}
}
protected static void playerStatusBack(PlayerInstance player)
protected void playerStatusBack(PlayerInstance player)
{
try
{
@@ -391,7 +391,7 @@ public abstract class AbstractOlympiadGame
}
}
protected static void portPlayerBack(PlayerInstance player)
protected void portPlayerBack(PlayerInstance player)
{
if (player == null)
{

View File

@@ -741,7 +741,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
_damageP2 = 0;
}
protected static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type)
protected void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type)
{
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement statement = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)"))

View File

@@ -182,7 +182,7 @@ public abstract class VoteSystem implements Runnable
}
}
private static void announce(String msg)
private void announce(String msg)
{
CreatureSay cs = new CreatureSay(0, ChatType.CRITICAL_ANNOUNCE, "", msg);
Broadcast.toAllOnlinePlayers(cs);

View File

@@ -316,7 +316,7 @@ public class RequestBypassToServer implements IClientIncomingPacket
/**
* @param player
*/
private static void comeHere(PlayerInstance player)
private void comeHere(PlayerInstance player)
{
final WorldObject obj = player.getTarget();
if (obj == null)