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

Various unnecessary code changes.

Browse Source
This commit is contained in:
MobiusDev
2018-06-26 15:00:56 +00:00
parent c9b04d53f4
commit 315a4e773c
869 changed files with 2683 additions and 12904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/AbstractNpcAI.java vendored
View File

@@ -20,14 +20,11 @@ import java.util.logging.Logger;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.MinionHolder;
import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
import com.l2jmobius.gameserver.util.Broadcast;
import com.l2jmobius.gameserver.util.Util;
/**
@@ -76,27 +73,6 @@ public abstract class AbstractNpcAI extends Quest
addFactionCallId(mobs);
}
/**
* Broadcasts SocialAction packet to self and known players.
* @param character
* @param actionId
*/
protected void broadcastSocialAction(L2Character character, int actionId)
{
Broadcast.toSelfAndKnownPlayers(character, new SocialAction(character.getObjectId(), actionId));
}
/**
* Broadcasts SocialAction packet to self and known players in specific radius.
* @param character
* @param actionId
* @param radius
*/
protected void broadcastSocialAction(L2Character character, int actionId, int radius)
{
Broadcast.toSelfAndKnownPlayersInRadius(character, new SocialAction(character.getObjectId(), actionId), radius);
}
public void spawnMinions(L2Npc npc, String spawnName)
{
for (MinionHolder is : npc.getParameters().getMinionList(spawnName))

24
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java vendored
View File

@@ -167,8 +167,12 @@ public final class Parade extends AbstractNpcAI
return (dd * 1000) / 6;
}
class Start implements Runnable
private class Start implements Runnable
{
public Start()
{
}
@Override
public void run()
{
@@ -179,8 +183,12 @@ public final class Parade extends AbstractNpcAI
}
}
class Spawn implements Runnable
private class Spawn implements Runnable
{
public Spawn()
{
}
@Override
public void run()
{
@@ -209,8 +217,12 @@ public final class Parade extends AbstractNpcAI
}
}
class Delete implements Runnable
private class Delete implements Runnable
{
public Delete()
{
}
@Override
public void run()
{
@@ -240,8 +252,12 @@ public final class Parade extends AbstractNpcAI
}
}
class Clean implements Runnable
private class Clean implements Runnable
{
public Clean()
{
}
@Override
public void run()
{

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java vendored
View File

@@ -73,12 +73,16 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI
return super.onAdvEvent(event, npc, player);
}
public static final class zoneInfo
private static final class zoneInfo
{
private int currentPoints = 0;
private int currentMonitorizedDamage = 0;
private int zoneStage = 0;
public zoneInfo()
{
}
void setZoneStage(int a)
{
zoneStage = a;

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TownOfGiran/Alexandria/Alexandria.java vendored
View File

@@ -122,7 +122,7 @@ public final class Alexandria extends AbstractNpcAI
return htmltext;
}
public static class AdditionalQuestItemHolder extends QuestItemHolder
private static class AdditionalQuestItemHolder extends QuestItemHolder
{
private final int _additionalId;

16
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Baylor/BaylorWarzone.java vendored
View File

@@ -16,6 +16,7 @@
*/
package ai.bosses.Baylor;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
@@ -28,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSee;
import com.l2jmobius.gameserver.model.holders.SkillHolder;
import com.l2jmobius.gameserver.model.instancezone.Instance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
import instances.AbstractInstance;
@@ -326,6 +328,20 @@ public final class BaylorWarzone extends AbstractInstance
return super.onSpawn(npc);
}
/**
* Broadcasts SocialAction packet to self and known players.
* @param character
* @param actionId
*/
private void broadcastSocialAction(L2Character character, int actionId)
{
final SocialAction action = new SocialAction(character.getObjectId(), actionId);
L2World.getInstance().forEachVisibleObject(character, L2PcInstance.class, player ->
{
player.sendPacket(action);
});
}
public static void main(String[] args)
{
new BaylorWarzone();

24
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java vendored
View File

@@ -70,17 +70,21 @@ public final class Stage1 extends AbstractInstance implements IGameXmlReader
{
Logger LOGGER = Logger.getLogger(Stage1.class.getName());
protected static class SODSpawn
private static class SODSpawn
{
public boolean isZone = false;
public boolean isNeededNextFlag = false;
public int npcId;
public int x = 0;
public int y = 0;
public int z = 0;
public int h = 0;
public int zone = 0;
public int count = 0;
public SODSpawn()
{
}
boolean isZone = false;
boolean isNeededNextFlag = false;
int npcId;
int x = 0;
int y = 0;
int z = 0;
int h = 0;
int zone = 0;
int count = 0;
}
// Spawn data

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferAI.java vendored
View File

@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author UnAfraid
*/
public class NpcBufferAI implements Runnable
class NpcBufferAI implements Runnable
{
private static final Logger LOGGER = Logger.getLogger(NpcBufferAI.class.getName());
private final L2Npc _npc;

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferData.java vendored
View File

@@ -22,12 +22,12 @@ import java.util.List;
/**
* @author UnAfraid
*/
public class NpcBufferData
class NpcBufferData
{
private final int _id;
private final List<NpcBufferSkillData> _skills = new ArrayList<>();
public NpcBufferData(int id)
NpcBufferData(int id)
{
_id = id;
}
@@ -37,7 +37,7 @@ public class NpcBufferData
return _id;
}
public void addSkill(NpcBufferSkillData skill)
void addSkill(NpcBufferSkillData skill)
{
_skills.add(skill);
}

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBufferSkillData.java vendored
View File

@@ -23,13 +23,13 @@ import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author UnAfraid
*/
public class NpcBufferSkillData
class NpcBufferSkillData
{
private final SkillHolder _skill;
private final int _scaleToLevel;
private final int _initialDelay;
public NpcBufferSkillData(StatsSet set)
NpcBufferSkillData(StatsSet set)
{
_skill = new SkillHolder(set.getInt("id"), set.getInt("level"));
_scaleToLevel = set.getInt("scaleToLevel", -1);

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/NpcBuffers/NpcBuffersData.java vendored
View File

@@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.model.StatsSet;
/**
* @author UnAfraid
*/
public class NpcBuffersData implements IGameXmlReader
class NpcBuffersData implements IGameXmlReader
{
private static final Logger LOGGER = Logger.getLogger(NpcBuffersData.class.getName());
@@ -93,7 +93,7 @@ public class NpcBuffersData implements IGameXmlReader
}
}
public NpcBufferData getNpcBuffer(int npcId)
NpcBufferData getNpcBuffer(int npcId)
{
return _npcBuffers.get(npcId);
}

4
L2J_Mobius_1.0_Ertheia/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}.
*/
public static void switchSkills(L2PcInstance gmchar, boolean toAuraSkills)
private static void switchSkills(L2PcInstance 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;
}
public static void showBuffs(L2PcInstance activeChar, L2Character target, int page, boolean passive)
private static void showBuffs(L2PcInstance activeChar, L2Character target, int page, boolean passive)
{
final List<BuffInfo> effects = new ArrayList<>();
if (!passive)

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java vendored
View File

@@ -464,7 +464,7 @@ public class AdminEventEngine implements IAdminCommandHandler
return note + result;
}
public void showMainPage(L2PcInstance activeChar)
private void showMainPage(L2PcInstance activeChar)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
@@ -473,7 +473,7 @@ public class AdminEventEngine implements IAdminCommandHandler
activeChar.sendPacket(adminReply);
}
public void showNewEventPage(L2PcInstance activeChar)
private void showNewEventPage(L2PcInstance activeChar)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
@@ -515,7 +515,7 @@ public class AdminEventEngine implements IAdminCommandHandler
activeChar.sendPacket(adminReply);
}
public void showEventParameters(L2PcInstance activeChar, int teamnumbers)
private void showEventParameters(L2PcInstance activeChar, int teamnumbers)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage(0, 1);
final StringBuilder sb = new StringBuilder();

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java vendored
View File

@@ -77,7 +77,7 @@ public class AdminHtml implements IAdminCommandHandler
* @param activeChar activeChar where html is shown
* @param path relative path from directory data/html/admin/ to html
*/
public static void showAdminHtml(L2PcInstance activeChar, String path)
static void showAdminHtml(L2PcInstance activeChar, String path)
{
showHtml(activeChar, "data/html/admin/" + path, false);
}
@@ -88,7 +88,7 @@ public class AdminHtml implements IAdminCommandHandler
* @param path relative path from Config.DATAPACK_ROOT to html.
* @param reload {@code true} will reload html and show it {@code false} will show it from cache.
*/
public static void showHtml(L2PcInstance activeChar, String path, boolean reload)
private static void showHtml(L2PcInstance activeChar, String path, boolean reload)
{
String content = null;
if (!reload)

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java vendored
View File

@@ -37,7 +37,7 @@ public class AdminMonsterRace implements IAdminCommandHandler
"admin_mons"
};
protected static int state = -1;
static int state = -1;
@Override
public boolean useAdminCommand(String command, L2PcInstance activeChar)
@@ -112,7 +112,7 @@ public class AdminMonsterRace implements IAdminCommandHandler
}
class RunRace implements Runnable
private class RunRace implements Runnable
{
private final int[][] codes;

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java vendored
View File

@@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.util.Util;
public class AdminQuest implements IAdminCommandHandler
{
public static final Logger LOGGER = Logger.getLogger(AdminQuest.class.getName());
private static final Logger LOGGER = Logger.getLogger(AdminQuest.class.getName());
private static final String[] ADMIN_COMMANDS =
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java vendored
View File

@@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.util.BuilderUtil;
*/
public class AdminSummon implements IAdminCommandHandler
{
public static final String[] ADMIN_COMMANDS =
private static final String[] ADMIN_COMMANDS =
{
"admin_summon"
};

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminSuperHaste.java vendored
View File

@@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
*/
public final class AdminSuperHaste implements IAdminCommandHandler
{
public static final String[] ADMIN_COMMANDS =
static final String[] ADMIN_COMMANDS =
{
"admin_superhaste",
"admin_superhaste_menu",

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/ClanWarehouse.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.bypasshandlers;
import java.util.logging.Level;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.handler.IBypassHandler;
import com.l2jmobius.gameserver.model.ClanPrivilege;
import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -41,6 +42,11 @@ public class ClanWarehouse implements IBypassHandler
@Override
public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
{
if (!Config.ALLOW_WAREHOUSE)
{
return false;
}
if (!target.isNpc())
{
return false;

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java vendored
View File

@@ -271,7 +271,7 @@ public class NpcViewMod implements IBypassHandler
activeChar.sendPacket(html);
}
public static void sendNpcSkillView(L2PcInstance activeChar, L2Npc npc)
private static void sendNpcSkillView(L2PcInstance activeChar, L2Npc npc)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar, "data/html/mods/NpcView/Skills.htm");
@@ -303,7 +303,7 @@ public class NpcViewMod implements IBypassHandler
activeChar.sendPacket(html);
}
public static void sendAggroListView(L2PcInstance activeChar, L2Npc npc)
private static void sendAggroListView(L2PcInstance activeChar, L2Npc npc)
{
final NpcHtmlMessage html = new NpcHtmlMessage();
html.setFile(activeChar, "data/html/mods/NpcView/AggroList.htm");

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java vendored
View File

@@ -18,6 +18,7 @@ package handlers.bypasshandlers;
import java.util.logging.Level;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.handler.IBypassHandler;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -37,6 +38,11 @@ public class PrivateWarehouse implements IBypassHandler
@Override
public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
{
if (!Config.ALLOW_WAREHOUSE)
{
return false;
}
if (!target.isNpc())
{
return false;

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java vendored
View File

@@ -81,7 +81,7 @@ public class QuestLink implements IBypassHandler
* @param npc The table containing quests of the L2NpcInstance
* @param quests
*/
public static void showQuestChooseWindow(L2PcInstance player, L2Npc npc, Collection<Quest> quests)
private static void showQuestChooseWindow(L2PcInstance player, L2Npc npc, Collection<Quest> quests)
{
final StringBuilder sbStarted = new StringBuilder(128);
final StringBuilder sbCanStart = new StringBuilder(128);
@@ -186,7 +186,7 @@ public class QuestLink implements IBypassHandler
* @param npc the L2NpcInstance that chats with the {@code player}
* @param questId the Id of the quest to display the message
*/
public static void showQuestWindow(L2PcInstance player, L2Npc npc, String questId)
private static void showQuestWindow(L2PcInstance player, L2Npc npc, String questId)
{
String content = null;

18
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java vendored
View File

@@ -55,16 +55,16 @@ public class DropSearchBoard implements IParseBoardHandler
"_bbs_npc_trace"
};
class CBDropHolder
private class CBDropHolder
{
int itemId;
int npcId;
byte npcLevel;
long min;
long max;
double chance;
boolean isSpoil;
boolean isRaid;
final int itemId;
final int npcId;
final byte npcLevel;
final long min;
final long max;
final double chance;
final boolean isSpoil;
final boolean isRaid;
public CBDropHolder(L2NpcTemplate npcTemplate, DropHolder dropHolder)
{

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/communityboard/HomeBoard.java vendored
View File

@@ -77,7 +77,7 @@ public final class HomeBoard implements IParseBoardHandler
Config.COMMUNITYBOARD_ENABLE_HEAL ? "_bbsheal" : null
};
public static final BiPredicate<String, L2PcInstance> COMBAT_CHECK = (command, activeChar) ->
private static final BiPredicate<String, L2PcInstance> COMBAT_CHECK = (command, activeChar) ->
{
boolean commandCheck = false;
for (String c : CUSTOM_COMMANDS)
@@ -92,7 +92,7 @@ public final class HomeBoard implements IParseBoardHandler
return commandCheck && (activeChar.isCastingNow() || activeChar.isInCombat() || activeChar.isInDuel() || activeChar.isInOlympiadMode() || activeChar.isInsideZone(ZoneId.SIEGE) || activeChar.isInsideZone(ZoneId.PVP));
};
public static final Predicate<L2PcInstance> KARMA_CHECK = player -> Config.COMMUNITYBOARD_KARMA_DISABLED && (player.getReputation() < 0);
private static final Predicate<L2PcInstance> KARMA_CHECK = player -> Config.COMMUNITYBOARD_KARMA_DISABLED && (player.getReputation() < 0);
@Override
public String[] getCommunityBoardCommands()

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java vendored
View File

@@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.model.stats.Stats;
/**
* @author UnAfraid
*/
public abstract class AbstractConditionalHpEffect extends AbstractStatEffect
abstract class AbstractConditionalHpEffect extends AbstractStatEffect
{
private final int _hpPercent;

23
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AirBind.java vendored
View File

@@ -95,20 +95,6 @@ public final class AirBind extends AbstractEffect
@Override
public void continuousInstant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
{
airBind(effector, effected);
}
@Override
public void onExit(L2Character effector, L2Character effected, Skill skill)
{
if (!effected.isPlayer())
{
effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
}
}
public void airBind(L2Character effector, L2Character effected)
{
for (L2PcInstance nearbyPlayer : L2World.getInstance().getVisibleObjects(effected, L2PcInstance.class, 1200))
{
@@ -123,4 +109,13 @@ public final class AirBind extends AbstractEffect
}
}
}
@Override
public void onExit(L2Character effector, L2Character effected, Skill skill)
{
if (!effected.isPlayer())
{
effected.getAI().notifyEvent(CtrlEvent.EVT_THINK);
}
}
}

3
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java vendored
View File

@@ -39,7 +39,7 @@ public final class BlockSkill extends AbstractEffect
_magicTypes = params.getIntArray("magicTypes", ";");
}
public TerminateReturn onSkillUseEvent(OnCreatureSkillUse event)
private TerminateReturn onSkillUseEvent(OnCreatureSkillUse event)
{
if (CommonUtil.contains(_magicTypes, event.getSkill().getMagicType()))
{
@@ -65,5 +65,4 @@ public final class BlockSkill extends AbstractEffect
{
effected.removeListenerIf(EventType.ON_CREATURE_SKILL_USE, listener -> listener.getOwner() == this);
}
}

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java vendored
View File

@@ -29,8 +29,8 @@ import com.l2jmobius.gameserver.util.MathUtil;
*/
public class CriticalDamagePosition extends AbstractEffect
{
protected final double _amount;
protected final Position _position;
private final double _amount;
private final Position _position;
public CriticalDamagePosition(StatsSet params)
{

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java vendored
View File

@@ -29,8 +29,8 @@ import com.l2jmobius.gameserver.util.MathUtil;
*/
public class CriticalRatePositionBonus extends AbstractEffect
{
protected final double _amount;
protected final Position _position;
private final double _amount;
private final Position _position;
public CriticalRatePositionBonus(StatsSet params)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java vendored
View File

@@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.util.Util;
*/
public final class Fear extends AbstractEffect
{
public static final int FEAR_RANGE = 500;
private static final int FEAR_RANGE = 500;
public Fear(StatsSet params)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java vendored
View File

@@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
*/
public class GetMomentum extends AbstractEffect
{
public static int _ticks;
private static int _ticks;
public GetMomentum(StatsSet params)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java vendored
View File

@@ -148,7 +148,7 @@ public final class KnockBack extends AbstractEffect
}
}
public void knockBack(L2Character effector, L2Character effected)
private void knockBack(L2Character effector, L2Character effected)
{
final double radians = Math.toRadians(Util.calculateAngleFrom(effector, effected));
final int x = (int) (effected.getX() + (_distance * Math.cos(radians)));

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ModifyVital.java vendored
View File

@@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
public final class ModifyVital extends AbstractEffect
{
// Modify types
enum ModifyType
private enum ModifyType
{
DIFF,
SET,

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java vendored
View File

@@ -45,7 +45,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
*/
public final class RestorationRandom extends AbstractEffect
{
final List<L2ExtractableProductItem> _products = new ArrayList<>();
private final List<L2ExtractableProductItem> _products = new ArrayList<>();
public RestorationRandom(StatsSet params)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java vendored
View File

@@ -69,7 +69,7 @@ public final class SoulEating extends AbstractEffect
effected.getStat().mergeAdd(Stats.MAX_SOULS, _maxSouls);
}
public void onExperienceReceived(L2Playable playable, long exp)
private void onExperienceReceived(L2Playable playable, long exp)
{
// TODO: Verify logic.
if (playable.isPlayer() && (exp >= _expNeeded))

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSkillCritical.java vendored
View File

@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.stats.Stats;
public class StatBonusSkillCritical extends AbstractEffect
{
private final BaseStats _stat;
protected final Condition _armorTypeCondition;
private final Condition _armorTypeCondition;
public StatBonusSkillCritical(StatsSet params)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatBonusSpeed.java vendored
View File

@@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.model.stats.Stats;
public class StatBonusSpeed extends AbstractEffect
{
private final BaseStats _stat;
protected final Condition _armorTypeCondition;
private final Condition _armorTypeCondition;
public StatBonusSpeed(StatsSet params)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java vendored
View File

@@ -85,7 +85,7 @@ public final class TriggerSkillByAttack extends AbstractEffect
}
}
public void onAttackEvent(OnCreatureDamageDealt event)
private void onAttackEvent(OnCreatureDamageDealt event)
{
if (event.isDamageOverTime() || (_chance == 0) || ((_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0)) || (!_allowNormalAttack && !_allowSkillAttack))
{

3
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java vendored
View File

@@ -46,7 +46,6 @@ public final class TriggerSkillByAvoid extends AbstractEffect
/**
* @param params
*/
public TriggerSkillByAvoid(StatsSet params)
{
_chance = params.getInt("chance", 100);
@@ -54,7 +53,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect
_targetType = params.getEnum("targetType", TargetType.class, TargetType.TARGET);
}
public void onAvoidEvent(OnCreatureAttackAvoid event)
private void onAvoidEvent(OnCreatureAttackAvoid event)
{
if (event.isDamageOverTime() || (_chance == 0) || ((_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0)))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java vendored
View File

@@ -58,7 +58,7 @@ public final class TriggerSkillByDamage extends AbstractEffect
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.L2Character);
}
public void onDamageReceivedEvent(OnCreatureDamageReceived event)
private void onDamageReceivedEvent(OnCreatureDamageReceived event)
{
if (event.isDamageOverTime() || (_chance == 0) || (_skill.getSkillLevel() == 0))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java vendored
View File

@@ -56,7 +56,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect
_attackerType = params.getEnum("attackerType", InstanceType.class, InstanceType.L2Character);
}
public void onDamageReceivedEvent(OnCreatureDamageReceived event)
private void onDamageReceivedEvent(OnCreatureDamageReceived event)
{
if (event.getDamage() < event.getTarget().getCurrentHp())
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java vendored
View File

@@ -42,7 +42,7 @@ public final class TriggerSkillByKill extends AbstractEffect
_skill = new SkillHolder(params.getInt("skillId", 0), params.getInt("skillLevel", 0));
}
public void onCreatureKilled(OnCreatureKilled event, L2Character target)
private void onCreatureKilled(OnCreatureKilled event, L2Character target)
{
if ((_chance == 0) || ((_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0)))
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java vendored
View File

@@ -60,7 +60,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect
_targetType = params.getEnum("targetType", TargetType.class, TargetType.TARGET);
}
public void onSkillUseEvent(OnCreatureSkillFinishCast event)
private void onSkillUseEvent(OnCreatureSkillFinishCast event)
{
if (!event.getTarget().isCharacter())
{

8
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedBluntBonus.java vendored
View File

@@ -36,11 +36,11 @@ public class TwoHandedBluntBonus extends AbstractEffect
private static final Condition _weaponTypeCondition = new ConditionUsingItemType(WeaponType.BLUNT.mask());
private static final Condition _slotCondition = new ConditionUsingSlotType(L2Item.SLOT_LR_HAND);
protected final double _pAtkAmount;
protected final StatModifierType _pAtkmode;
private final double _pAtkAmount;
private final StatModifierType _pAtkmode;
protected final double _accuracyAmount;
protected final StatModifierType _accuracyMode;
private final double _accuracyAmount;
private final StatModifierType _accuracyMode;
public TwoHandedBluntBonus(StatsSet params)
{

8
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TwoHandedSwordBonus.java vendored
View File

@@ -36,11 +36,11 @@ public class TwoHandedSwordBonus extends AbstractEffect
private static final Condition _weaponTypeCondition = new ConditionUsingItemType(WeaponType.SWORD.mask());
private static final Condition _slotCondition = new ConditionUsingSlotType(L2Item.SLOT_LR_HAND);
protected final double _pAtkAmount;
protected final StatModifierType _pAtkmode;
private final double _pAtkAmount;
private final StatModifierType _pAtkmode;
protected final double _accuracyAmount;
protected final StatModifierType _accuracyMode;
private final double _accuracyAmount;
private final StatModifierType _accuracyMode;
public TwoHandedSwordBonus(StatsSet params)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/PetFood.java vendored
View File

@@ -54,7 +54,7 @@ public class PetFood implements IItemHandler
return true;
}
public boolean useFood(L2Playable activeChar, int skillId, int skillLevel, L2ItemInstance item)
private boolean useFood(L2Playable activeChar, int skillId, int skillLevel, L2ItemInstance item)
{
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
if (skill != null)

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/playeractions/SitStand.java vendored
View File

@@ -58,7 +58,7 @@ public final class SitStand implements IPlayerActionHandler
* @param target the target to sit, throne, bench or chair
* @return {@code true} if the player can sit, {@code false} otherwise
*/
protected boolean useSit(L2PcInstance activeChar, L2Object target)
private boolean useSit(L2PcInstance activeChar, L2Object target)
{
if (activeChar.getMountType() != MountType.NONE)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java vendored
View File

@@ -47,7 +47,7 @@ public class JailHandler implements IPunishmentHandler
Containers.Global().addListener(new ConsumerEventListener(Containers.Global(), EventType.ON_PLAYER_LOGIN, (OnPlayerLogin event) -> onPlayerLogin(event), this));
}
public void onPlayerLogin(OnPlayerLogin event)
private void onPlayerLogin(OnPlayerLogin event)
{
final L2PcInstance activeChar = event.getActiveChar();
if (activeChar.isJailed() && !activeChar.isInsideZone(ZoneId.JAIL))

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpSkillAcquireSkillCondition.java vendored
View File

@@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
*/
public class OpSkillAcquireSkillCondition implements ISkillCondition
{
final int _skillId;
private final int _skillId;
private final boolean _hasLearned;
public OpSkillAcquireSkillCondition(StatsSet params)

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/TargetMyPartySkillCondition.java vendored
View File

@@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.skills.Skill;
*/
public class TargetMyPartySkillCondition implements ISkillCondition
{
final boolean _includeMe;
private final boolean _includeMe;
public TargetMyPartySkillCondition(StatsSet params)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/telnethandlers/server/Debug.java vendored
View File

@@ -251,7 +251,7 @@ public class Debug implements ITelnetCommand
throw new IllegalStateException("Deadlocked Thread not found");
}
public static String getServerStatus()
static String getServerStatus()
{
int playerCount = 0, objectCount = 0;
final int max = LoginServerThread.getInstance().getMaxPlayer();

5
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/voicedcommandhandlers/AutoPotion.java vendored
View File

@@ -44,11 +44,6 @@ public class AutoPotion implements IVoicedCommandHandler
"apoff"
};
public static AutoPotion getInstance()
{
return null;
}
@Override
public boolean useVoicedCommand(String command, L2PcInstance activeChar, String target)
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/TalkingIslandPast/TalkingIslandPast.java vendored
View File

@@ -112,7 +112,7 @@ public final class TalkingIslandPast extends AbstractInstance
return super.onExitZone(character, zone);
}
public void onCreatureSee(OnCreatureSee event)
private void onCreatureSee(OnCreatureSee event)
{
final L2Character creature = event.getSeen();
final L2Npc npc = (L2Npc) event.getSeer();

8
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java vendored
View File

@@ -30,12 +30,12 @@ import com.l2jmobius.gameserver.util.Util;
*/
public class Q00180_InfernalFlamesBurningInCrystalPrison extends Quest
{
// Npc
public static final int FIOREN = 33044;
// NPC
private static final int FIOREN = 33044;
// Monster
public static final int BAYLOR = 29213;
private static final int BAYLOR = 29213;
// Misc
public static final int MIN_LEVEL = 97;
private static final int MIN_LEVEL = 97;
// Quest Item
private static final int BELETH_MARK = 17591;
// Item

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java vendored
View File

@@ -26,12 +26,12 @@ import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.util.Util;
/**
* @hlwrave
* @author hlwrave
* @URL https://l2wiki.com/Devils_Strike_Back,_Advent_of_Balok
*/
public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest
{
// Npc
// NPC
private static final int FIOREN = 33044;
// Monster
private static final int BALOK = 29218;
@@ -41,7 +41,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest
private static final int EWR = 17526;
private static final int POUCH = 34861;
// Misc
public static final int MIN_LEVEL = 97;
private static final int MIN_LEVEL = 97;
public Q00181_DevilsStrikeBackAdventOfBalok()
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java vendored
View File

@@ -33,7 +33,7 @@ public class Q00254_LegendaryTales extends Quest
private static final int GILMORE = 30754;
// Monsters
public enum Bosses
private enum Bosses
{
EMERALD_HORN(25718),
DUST_RIDER(25719),

8
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00465_WeAreFriends/Q00465_WeAreFriends.java vendored
View File

@@ -31,10 +31,10 @@ import com.l2jmobius.gameserver.model.quest.State;
*/
public class Q00465_WeAreFriends extends Quest
{
// Npc
public static final int FAIRY_CITIZEN = 32921;
public static final int FAIRY_CITIZEN_SPAWN = 32923;
// item
// NPCs
private static final int FAIRY_CITIZEN = 32921;
private static final int FAIRY_CITIZEN_SPAWN = 32923;
// Item
private static final int MARK_OF_FRIENDSHIP = 17377;
private static final int FAIRY_LEAF_FLUTE = 17378;
private static final int CERTIFICATE_OF_PROMISE = 30384;

16
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java vendored
View File

@@ -35,8 +35,8 @@ public class Q00466_PlacingMySmallPower extends Quest
{
// NPCs
private static final int ASTERIOS = 30154;
public static final int NOETI_MIMILEAD = 32895;
public static final int[] COCON =
private static final int NOETI_MIMILEAD = 32895;
private static final int[] COCON =
{
19394 // Large Cocoon
};
@@ -60,13 +60,13 @@ public class Q00466_PlacingMySmallPower extends Quest
22878 // Fairy Rogue
};
// Items
public static final int FAIRY_WING = 17597;
public static final int COCOON_FRAGMENT = 17598;
public static final int KIMERIANS_BREATH = 17599;
public static final int TEMINIELS_TONIC = 17596;
public static final int TONIC_RECIPE = 17603;
private static final int FAIRY_WING = 17597;
private static final int COCOON_FRAGMENT = 17598;
private static final int KIMERIANS_BREATH = 17599;
private static final int TEMINIELS_TONIC = 17596;
private static final int TONIC_RECIPE = 17603;
// Reward
public static final int CERTIFICATE_OF_PROMISE = 30384;
private static final int CERTIFICATE_OF_PROMISE = 30384;
// Misc
private static final int MIN_LEVEL = 90;

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java vendored
View File

@@ -34,8 +34,8 @@ import com.l2jmobius.gameserver.util.Util;
*/
public class Q00469_SuspiciousGardener extends Quest
{
// Npc
public static final int GOFINA = 33031;
// NPC
private static final int GOFINA = 33031;
// Monsters
private static final int APHERIUS_LOOKOUT_BEWILDERED = 22964;
// Items

10
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java vendored
View File

@@ -30,14 +30,14 @@ import com.l2jmobius.gameserver.util.Util;
*/
public class Q00471_BreakingThroughTheEmeraldSquare extends Quest
{
// Npc
public static final int FIOREN = 33044;
// NPC
private static final int FIOREN = 33044;
// Monster
public static final int EMABIFI = 25881;
private static final int EMABIFI = 25881;
// Misc
public static final int MIN_LEVEL = 97;
private static final int MIN_LEVEL = 97;
// Items
public static final int CERTIFICATE = 30387;
private static final int CERTIFICATE = 30387;
public Q00471_BreakingThroughTheEmeraldSquare()
{

10
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java vendored
View File

@@ -30,14 +30,14 @@ import com.l2jmobius.gameserver.util.Util;
*/
public class Q00472_ChallengeSteamCorridor extends Quest
{
// Npc
public static final int FIOREN = 33044;
// NPC
private static final int FIOREN = 33044;
// Monster
public static final int KECHI = 25532;
private static final int KECHI = 25532;
// Mis
public static final int MIN_LEVEL = 97;
private static final int MIN_LEVEL = 97;
// Item
public static final int CERTIFICATE = 30387;
private static final int CERTIFICATE = 30387;
public Q00472_ChallengeSteamCorridor()
{

12
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java vendored
View File

@@ -26,18 +26,18 @@ import com.l2jmobius.gameserver.util.Util;
/**
* @author hlwrave
* @URL: https://l2wiki.com/In_the_Coral_Garden
* @URL https://l2wiki.com/In_the_Coral_Garden
*/
public class Q00473_InTheCoralGarden extends Quest
{
// Npc
public static final int FIOREN = 33044;
// NPC
private static final int FIOREN = 33044;
// Monster
public static final int MICHAEL = 25799;
private static final int MICHAEL = 25799;
// Misc
public static final int MIN_LEVEL = 97;
private static final int MIN_LEVEL = 97;
// Item
public static final int CERTIFICATE = 30387;
private static final int CERTIFICATE = 30387;
public Q00473_InTheCoralGarden()
{

8
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00483_IntendedTactic/Q00483_IntendedTactic.java vendored
View File

@@ -31,9 +31,9 @@ import com.l2jmobius.gameserver.model.quest.State;
*/
public class Q00483_IntendedTactic extends Quest
{
// Npc
public static final int ENDE = 33357;
// Mobs
// NPC
private static final int ENDE = 33357;
// Monsters
private static final int[] MOBS =
{
23069, // Vladimir's Warrior
@@ -50,7 +50,7 @@ public class Q00483_IntendedTactic extends Quest
25811, // Lazearth
25815 // Ken
};
// items
// Items
private static final int LOYAL_SERVANS_BLOOD = 17736;
private static final int TRUTTHFUL_ONES_BLOOD = 17737;
private static final int TOKEN_OF_INSOLENCE_TOWER = 17624;

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java vendored
View File

@@ -287,7 +287,7 @@ public class Q00663_SeductiveWhispers extends Quest
return event;
}
public String play(L2PcInstance player, boolean isPlayerTurn, boolean isPractice)
private String play(L2PcInstance player, boolean isPlayerTurn, boolean isPractice)
{
boolean isPlayerWin = false;
boolean isNpcWin = false;

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java vendored
View File

@@ -43,7 +43,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10);
// Misc
private static final int MIN_LEVEL = 81;
boolean isBusy = false;
private boolean isBusy = false;
// Monster
private static final int CREATURE_OF_THE_DUSK1 = 27422;
private static final int CREATURE_OF_THE_DUSK2 = 27424;

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java vendored
View File

@@ -444,7 +444,7 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
return htmltext;
}
public boolean hasCheckedAllRightBooks(QuestState qs)
private boolean hasCheckedAllRightBooks(QuestState qs)
{
return ((qs.getInt("good1") == 1) && (qs.getInt("good2") == 1) && (qs.getInt("good3") == 1) && (qs.getInt("good4") == 1));
}

4
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java vendored
View File

@@ -35,8 +35,8 @@ import com.l2jmobius.gameserver.model.quest.State;
public final class Q10353_CertificationOfValue extends Quest
{
// NPCs
public static final int RIEYI = 33155;
public static final int KYUORI = 33358;
private static final int RIEYI = 33155;
private static final int KYUORI = 33358;
private static final int DUMMY_MONSTER = 33349;
private static final int[] MONSTERS =
{

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java vendored
View File

@@ -658,7 +658,7 @@ public final class Q10369_NoblesseSoulTesting extends Quest
return super.onFirstTalk(npc, player);
}
public boolean canProgress(L2PcInstance player)
private boolean canProgress(L2PcInstance player)
{
return ((player.getLevel() > MIN_LEVEL) && player.isSubClassActive());
}

20
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/vehicles/AirShipController.java vendored
View File

@@ -43,8 +43,12 @@ import ai.AbstractNpcAI;
public abstract class AirShipController extends AbstractNpcAI
{
protected final class DecayTask implements Runnable
private final class DecayTask implements Runnable
{
public DecayTask()
{
}
@Override
public void run()
{
@@ -55,8 +59,12 @@ public abstract class AirShipController extends AbstractNpcAI
}
}
protected final class DepartTask implements Runnable
private final class DepartTask implements Runnable
{
public DepartTask()
{
}
@Override
public void run()
{
@@ -74,14 +82,14 @@ public abstract class AirShipController extends AbstractNpcAI
}
}
public static final Logger LOGGER = Logger.getLogger(AirShipController.class.getName());
private static final Logger LOGGER = Logger.getLogger(AirShipController.class.getName());
protected int _dockZone = 0;
protected int _shipSpawnX = 0;
protected int _shipSpawnY = 0;
protected int _shipSpawnZ = 0;
protected int _shipHeading = 0;
private final int _shipHeading = 0;
protected Location _oustLoc = null;
protected int _locationId = 0;
@@ -94,8 +102,8 @@ public abstract class AirShipController extends AbstractNpcAI
protected Movie _movie = null;
protected boolean _isBusy = false;
protected L2ControllableAirShipInstance _dockedShip = null;
private boolean _isBusy = false;
L2ControllableAirShipInstance _dockedShip = null;
private final Runnable _decayTask = new DecayTask();
private final Runnable _departTask = new DepartTask();