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

More final and static cleanups.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Elpies/Elpies.java vendored
View File

@@ -223,7 +223,7 @@ public class Elpies extends Event
}
}
private static void dropItem(Npc mob, PlayerInstance player, int[][] droplist)
private void dropItem(Npc mob, PlayerInstance player, int[][] droplist)
{
final int chance = getRandom(100);

4
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java vendored
View File

@@ -240,7 +240,7 @@ public class Rabbits extends Event
return super.onAttack(npc, attacker, damage, isSummon);
}
private static void dropItem(Npc npc, PlayerInstance player, int[][] droplist)
private void dropItem(Npc npc, PlayerInstance player, int[][] droplist)
{
final int chance = getRandom(100);
for (int[] drop : droplist)
@@ -253,7 +253,7 @@ public class Rabbits extends Event
}
}
private static void recordSpawn(List<Npc> npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay)
private void recordSpawn(List<Npc> npcs, int npcId, int x, int y, int z, int heading, boolean randomOffSet, long despawnDelay)
{
final Npc npc = addSpawn(npcId, x, y, z, heading, randomOffSet, despawnDelay);
if (npc.getId() == CHEST)

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/MerrySquashmas/MerrySquashmas.java vendored
View File

@@ -572,7 +572,7 @@ public class MerrySquashmas extends LongTimeEvent
return npc.getId() + ".htm";
}
private static final void dropItem(Npc mob, PlayerInstance player)
private void dropItem(Npc mob, PlayerInstance player)
{
final int npcId = mob.getId();
for (int[] drop : DROPLIST)

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/SquashEvent/SquashEvent.java vendored
View File

@@ -571,7 +571,7 @@ public class SquashEvent extends LongTimeEvent
return npc.getId() + ".htm";
}
private static final void dropItem(Npc mob, PlayerInstance player)
private void dropItem(Npc mob, PlayerInstance player)
{
final int npcId = mob.getId();
for (int[] drop : DROPLIST)

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/events/WatermelonNinja/WatermelonNinja.java vendored
View File

@@ -569,7 +569,7 @@ public class WatermelonNinja extends LongTimeEvent
return npc.getId() + ".htm";
}
private static final void dropItem(Npc mob, PlayerInstance player)
private void dropItem(Npc mob, PlayerInstance player)
{
final int npcId = mob.getId();
final int chance = Rnd.get(100);

10
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java vendored
View File

@@ -276,7 +276,7 @@ public class AdminBuffs implements IAdminCommandHandler
* @param gmchar the player to switch the Game Master skills.
* @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}.
*/
private static void switchSkills(PlayerInstance gmchar, boolean toAuraSkills)
private void switchSkills(PlayerInstance gmchar, boolean toAuraSkills)
{
final Collection<Skill> skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree();
for (Skill skill : skills)
@@ -292,7 +292,7 @@ public class AdminBuffs implements IAdminCommandHandler
return ADMIN_COMMANDS;
}
private static void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive)
private void showBuffs(PlayerInstance activeChar, Creature target, int page, boolean passive)
{
final List<BuffInfo> effects = new ArrayList<>();
if (!passive)
@@ -353,7 +353,7 @@ public class AdminBuffs implements IAdminCommandHandler
}
}
private static void removeBuff(PlayerInstance activeChar, int objId, int skillId)
private void removeBuff(PlayerInstance activeChar, int objId, int skillId)
{
Creature target = null;
try
@@ -380,7 +380,7 @@ public class AdminBuffs implements IAdminCommandHandler
}
}
private static void removeAllBuffs(PlayerInstance activeChar, int objId)
private void removeAllBuffs(PlayerInstance activeChar, int objId)
{
Creature target = null;
try
@@ -403,7 +403,7 @@ public class AdminBuffs implements IAdminCommandHandler
}
}
private static void viewBlockedEffects(PlayerInstance activeChar, int objId)
private void viewBlockedEffects(PlayerInstance activeChar, int objId)
{
Creature target = null;
try

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminChangeAccessLevel.java vendored
View File

@@ -113,7 +113,7 @@ public class AdminChangeAccessLevel implements IAdminCommandHandler
* @param player the online target
* @param lvl the access level
*/
private static void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl)
private void onlineChange(PlayerInstance activeChar, PlayerInstance player, int lvl)
{
if (lvl >= 0)
{

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminFence.java vendored
View File

@@ -174,7 +174,7 @@ public class AdminFence implements IAdminCommandHandler
return ADMIN_COMMANDS;
}
private static void sendHtml(PlayerInstance activeChar, int page)
private void sendHtml(PlayerInstance activeChar, int page)
{
final PageResult result = PageBuilder.newBuilder(FenceData.getInstance().getFences().values(), 10, "bypass -h admin_listfence").currentPage(page).style(ButtonsStyle.INSTANCE).bodyHandler((pages, fence, sb) ->
{

6
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java vendored
View File

@@ -153,7 +153,7 @@ public class AdminShowQuests implements IAdminCommandHandler
return true;
}
private static void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor)
private void showFirstQuestMenu(PlayerInstance target, PlayerInstance actor)
{
final StringBuilder replyMSG = new StringBuilder("<html><body><table width=270><tr><td width=45><button value=\"Main\" action=\"bypass -h admin_admin\" width=45 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td><td width=180><center>Player: " + target.getName() + "</center></td><td width=45><button value=\"Back\" action=\"bypass -h admin_admin6\" width=45 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table>");
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
@@ -171,7 +171,7 @@ public class AdminShowQuests implements IAdminCommandHandler
actor.sendPacket(adminReply);
}
private static void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val)
private void showQuestMenu(PlayerInstance target, PlayerInstance actor, String[] val)
{
try (Connection con = DatabaseFactory.getConnection())
{
@@ -317,7 +317,7 @@ public class AdminShowQuests implements IAdminCommandHandler
}
}
private static void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val)
private void setQuestVar(PlayerInstance target, PlayerInstance actor, String[] val)
{
QuestState qs = target.getQuestState(val[0]);
final String[] outval = new String[3];

4
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminZone.java vendored
View File

@@ -111,7 +111,7 @@ public class AdminZone implements IAdminCommandHandler
return true;
}
private static void showHtml(PlayerInstance activeChar)
private void showHtml(PlayerInstance activeChar)
{
final String htmContent = HtmCache.getInstance().getHtm(activeChar, "data/html/admin/zone.htm");
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
@@ -163,7 +163,7 @@ public class AdminZone implements IAdminCommandHandler
activeChar.sendPacket(adminReply);
}
private static void getGeoRegionXY(PlayerInstance activeChar)
private void getGeoRegionXY(PlayerInstance activeChar)
{
final int worldX = activeChar.getX();
final int worldY = activeChar.getY();

6
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler
player.sendPacket(html);
}
private static void sendNpcSkillView(PlayerInstance player, Npc npc)
private void sendNpcSkillView(PlayerInstance player, Npc npc)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(player, "data/html/mods/NpcView/Skills.htm");
@@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler
player.sendPacket(html);
}
private static void sendAggroListView(PlayerInstance player, Npc npc)
private void sendAggroListView(PlayerInstance player, Npc npc)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(player, "data/html/mods/NpcView/AggroList.htm");
@@ -358,7 +358,7 @@ public class NpcViewMod implements IBypassHandler
return sb.toString();
}
private static void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
private void sendNpcDropList(PlayerInstance player, Npc npc, DropType dropType, int page)
{
final List<DropHolder> dropList = npc.getTemplate().getDropList(dropType);
if (dropList == null)

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Observation.java vendored
View File

@@ -154,7 +154,7 @@ public class Observation implements IBypassHandler
return false;
}
private static void doObserve(PlayerInstance player, Npc npc, Location pos, long cost)
private void doObserve(PlayerInstance player, Npc npc, Location pos, long cost)
{
if (player.reduceAdena("Broadcast", cost, npc, true))
{

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java vendored
View File

@@ -78,7 +78,7 @@ public class PrivateWarehouse implements IBypassHandler
return false;
}
private static void showWithdrawWindow(PlayerInstance player)
private void showWithdrawWindow(PlayerInstance player)
{
player.sendPacket(ActionFailed.STATIC_PACKET);
player.setActiveWarehouse(player.getWarehouse());

6
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java vendored
View File

@@ -84,7 +84,7 @@ public class QuestLink implements IBypassHandler
* @param npc The table containing quests of the NpcInstance
* @param quests
*/
private static void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection<Quest> quests)
private void showQuestChooseWindow(PlayerInstance player, Npc npc, Collection<Quest> quests)
{
final StringBuilder sbStarted = new StringBuilder(128);
final StringBuilder sbCanStart = new StringBuilder(128);
@@ -241,7 +241,7 @@ public class QuestLink implements IBypassHandler
* @param npc the NpcInstance that chats with the {@code player}
* @param questId the Id of the quest to display the message
*/
private static void showQuestWindow(PlayerInstance player, Npc npc, String questId)
private void showQuestWindow(PlayerInstance player, Npc npc, String questId)
{
String content = null;
@@ -296,7 +296,7 @@ public class QuestLink implements IBypassHandler
* @param player the PlayerInstance that talk with the {@code npc}.
* @param npc the NpcInstance that chats with the {@code player}.
*/
private static void showQuestWindow(PlayerInstance player, Npc npc)
private void showQuestWindow(PlayerInstance player, Npc npc)
{
//@formatter:off
final Set<Quest> quests = npc.getListeners(EventType.ON_NPC_TALK).stream()

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java vendored
View File

@@ -96,7 +96,7 @@ public class SupportMagic implements IBypassHandler
return true;
}
private static void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon)
private void makeSupportMagic(PlayerInstance player, Npc npc, boolean isSummon)
{
final int level = player.getLevel();
if (isSummon && !player.hasServitors())

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/bypasshandlers/Wear.java vendored
View File

@@ -68,7 +68,7 @@ public class Wear implements IBypassHandler
return false;
}
private static void showWearWindow(PlayerInstance player, int val)
private void showWearWindow(PlayerInstance player, int val)
{
final ProductList buyList = BuyListData.getInstance().getBuyList(val);
if (buyList == null)

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/BanHandler.java vendored
View File

@@ -89,7 +89,7 @@ public class BanHandler implements IPunishmentHandler
* Applies all punishment effects from the player.
* @param player
*/
private static void applyToPlayer(PlayerInstance player)
private void applyToPlayer(PlayerInstance player)
{
Disconnection.of(player).defaultSequence(false);
}

4
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/ChatBanHandler.java vendored
View File

@@ -124,7 +124,7 @@ public class ChatBanHandler implements IPunishmentHandler
* @param task
* @param player
*/
private static void applyToPlayer(PunishmentTask task, PlayerInstance player)
private void applyToPlayer(PunishmentTask task, PlayerInstance player)
{
final long delay = ((task.getExpirationTime() - System.currentTimeMillis()) / 1000);
if (delay > 0)
@@ -142,7 +142,7 @@ public class ChatBanHandler implements IPunishmentHandler
* Removes any punishment effects from the player.
* @param player
*/
private static void removeFromPlayer(PlayerInstance player)
private void removeFromPlayer(PlayerInstance player)
{
player.sendMessage("Your Chat ban has been lifted");
player.sendPacket(new EtcStatusUpdate(player));

4
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java vendored
View File

@@ -153,7 +153,7 @@ public class JailHandler implements IPunishmentHandler
* @param task
* @param player
*/
private static void applyToPlayer(PunishmentTask task, PlayerInstance player)
private void applyToPlayer(PunishmentTask task, PlayerInstance player)
{
player.setInstance(null);
@@ -196,7 +196,7 @@ public class JailHandler implements IPunishmentHandler
* Removes any punishment effects from the player.
* @param player
*/
private static void removeFromPlayer(PlayerInstance player)
private void removeFromPlayer(PlayerInstance player)
{
ThreadPool.schedule(new TeleportTask(player, JailZone.getLocationOut()), 2000);

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java vendored
View File

@@ -154,7 +154,7 @@ public class Q00306_CrystalOfFireAndIce extends Quest
return htmltext;
}
private static void giveKillReward(PlayerInstance player, Npc npc)
private void giveKillReward(PlayerInstance player, Npc npc)
{
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java vendored
View File

@@ -316,7 +316,7 @@ public class Q00414_PathOfTheOrcRaider extends Quest
return htmltext;
}
private static void attackPlayer(Attackable npc, PlayerInstance player)
private void attackPlayer(Attackable npc, PlayerInstance player)
{
if ((npc != null) && (player != null))
{

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java
View File

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

4
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/instancemanager/ClanEntryManager.java
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(() ->
{

10
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@@ -895,7 +895,7 @@ public class VillageMasterInstance extends NpcInstance
return player.getSubClasses().values().iterator();
}
private static void dissolveClan(PlayerInstance player, int clanId)
private void dissolveClan(PlayerInstance player, int clanId)
{
if (!player.isClanLeader())
{
@@ -956,7 +956,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())
{
@@ -969,7 +969,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())
{
@@ -1079,7 +1079,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())
{
@@ -1112,7 +1112,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())
{

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/events/AbstractScript.java
View File

@@ -2603,7 +2603,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());
}

8
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
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)
{

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java
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(?,?,?,?,?,?,?,?)"))

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/votereward/VoteSystem.java
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);

2
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
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)