Cleanup of unnecessary void method and class modifiers.
This commit is contained in:
@@ -142,7 +142,7 @@ public class TarBeetleSpawn implements IXmlReader
|
||||
npc.deleteMe();
|
||||
}
|
||||
|
||||
private final class Zone extends Territory
|
||||
private class Zone extends Territory
|
||||
{
|
||||
private List<Zone> _bannedZones;
|
||||
|
||||
@@ -187,7 +187,7 @@ public class TarBeetleSpawn implements IXmlReader
|
||||
}
|
||||
}
|
||||
|
||||
private final class SpawnZone
|
||||
private class SpawnZone
|
||||
{
|
||||
private final List<Zone> _zones = new ArrayList<>();
|
||||
private final Collection<Npc> _spawn = ConcurrentHashMap.newKeySet();
|
||||
|
||||
@@ -44,7 +44,7 @@ import ai.AbstractNpcAI;
|
||||
|
||||
public abstract class AirShipController extends AbstractNpcAI
|
||||
{
|
||||
protected final class DecayTask implements Runnable
|
||||
protected class DecayTask implements Runnable
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
@@ -56,7 +56,7 @@ public abstract class AirShipController extends AbstractNpcAI
|
||||
}
|
||||
}
|
||||
|
||||
protected final class DepartTask implements Runnable
|
||||
protected class DepartTask implements Runnable
|
||||
{
|
||||
@Override
|
||||
public void run()
|
||||
|
||||
@@ -119,7 +119,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
|
||||
_ship.runEngine(60000);
|
||||
}
|
||||
|
||||
private final void broadcastInGludio(NpcStringId npcString)
|
||||
private void broadcastInGludio(NpcStringId npcString)
|
||||
{
|
||||
if (!_foundAtcGludio)
|
||||
{
|
||||
@@ -132,7 +132,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
|
||||
}
|
||||
}
|
||||
|
||||
private final void broadcastInGracia(NpcStringId npcStringId)
|
||||
private void broadcastInGracia(NpcStringId npcStringId)
|
||||
{
|
||||
if (!_foundAtcGracia)
|
||||
{
|
||||
|
||||
@@ -770,7 +770,7 @@ public class Antharas extends AbstractNpcAI
|
||||
GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime);
|
||||
}
|
||||
|
||||
private final void refreshAiParams(Player attacker, int damage)
|
||||
private void refreshAiParams(Player attacker, int damage)
|
||||
{
|
||||
if ((attacker_1 != null) && (attacker == attacker_1))
|
||||
{
|
||||
|
||||
@@ -616,12 +616,12 @@ public class Baium extends AbstractNpcAI
|
||||
return super.unload(removeFromList);
|
||||
}
|
||||
|
||||
private final void refreshAiParams(Creature attacker, Npc npc, int damage)
|
||||
private void refreshAiParams(Creature attacker, Npc npc, int damage)
|
||||
{
|
||||
refreshAiParams(attacker, npc, damage, damage);
|
||||
}
|
||||
|
||||
private final void refreshAiParams(Creature attacker, Npc npc, int damage, int aggro)
|
||||
private void refreshAiParams(Creature attacker, Npc npc, int damage, int aggro)
|
||||
{
|
||||
final int newAggroVal = damage + getRandom(3000);
|
||||
final int aggroVal = aggro + 1000;
|
||||
|
||||
@@ -172,7 +172,7 @@ public class CastleChamberlain extends AbstractNpcAI
|
||||
return "chamberlain-21.html";
|
||||
}
|
||||
|
||||
private final void funcReplace(Castle castle, NpcHtmlMessage html, int func, String str)
|
||||
private void funcReplace(Castle castle, NpcHtmlMessage html, int func, String str)
|
||||
{
|
||||
final CastleFunction function = castle.getFunction(func);
|
||||
if (function == null)
|
||||
|
||||
@@ -163,7 +163,7 @@ public class VarkaKetra extends AbstractNpcAI
|
||||
}
|
||||
}
|
||||
|
||||
private final void decreaseAlliance(Player player, int[] marks)
|
||||
private void decreaseAlliance(Player player, int[] marks)
|
||||
{
|
||||
for (int i = 0; i < marks.length; i++)
|
||||
{
|
||||
@@ -179,7 +179,7 @@ public class VarkaKetra extends AbstractNpcAI
|
||||
}
|
||||
}
|
||||
|
||||
private final void exitQuests(Player player, String[] quests)
|
||||
private void exitQuests(Player player, String[] quests)
|
||||
{
|
||||
for (String quest : quests)
|
||||
{
|
||||
|
||||
@@ -87,7 +87,7 @@ public class FortressOfResistance extends ClanHallSiegeEngine
|
||||
}
|
||||
}
|
||||
|
||||
private final void buildMessengerMessage()
|
||||
private void buildMessengerMessage()
|
||||
{
|
||||
final String html = HtmCache.getInstance().getHtm(null, "data/scripts/conquerablehalls/FortressOfResistance/partisan_ordery_brakel001.htm");
|
||||
if (html != null)
|
||||
|
||||
@@ -671,7 +671,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
|
||||
saveMember(clanId, clan.getLeaderId());
|
||||
}
|
||||
|
||||
private final void doUnSpawns(ClanData data)
|
||||
private void doUnSpawns(ClanData data)
|
||||
{
|
||||
if (data.flagInstance != null)
|
||||
{
|
||||
@@ -685,7 +685,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
|
||||
}
|
||||
}
|
||||
|
||||
private final void removeParticipant(int clanId, boolean teleport)
|
||||
private void removeParticipant(int clanId, boolean teleport)
|
||||
{
|
||||
final ClanData dat = _data.remove(clanId);
|
||||
if (dat != null)
|
||||
@@ -777,7 +777,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
|
||||
}
|
||||
}
|
||||
|
||||
private final void loadAttackerMembers(int clanId)
|
||||
private void loadAttackerMembers(int clanId)
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection())
|
||||
{
|
||||
@@ -805,7 +805,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
|
||||
}
|
||||
}
|
||||
|
||||
private final void saveClan(int clanId, int flag)
|
||||
private void saveClan(int clanId, int flag)
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection())
|
||||
{
|
||||
@@ -823,7 +823,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
|
||||
}
|
||||
}
|
||||
|
||||
private final void saveNpc(int npc, int clanId)
|
||||
private void saveNpc(int npc, int clanId)
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection())
|
||||
{
|
||||
@@ -839,7 +839,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
|
||||
}
|
||||
}
|
||||
|
||||
private final void saveMember(int clanId, int objectId)
|
||||
private void saveMember(int clanId, int objectId)
|
||||
{
|
||||
try (Connection con = DatabaseFactory.getConnection())
|
||||
{
|
||||
|
||||
@@ -1440,7 +1440,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
||||
activeChar.sendPacket(adminReply);
|
||||
}
|
||||
|
||||
private final class IpPack
|
||||
private class IpPack
|
||||
{
|
||||
String ip;
|
||||
int[][] tracert;
|
||||
@@ -1577,7 +1577,7 @@ public class AdminEditChar implements IAdminCommandHandler
|
||||
activeChar.sendPacket(html);
|
||||
}
|
||||
|
||||
private final class Untransform implements Runnable
|
||||
private class Untransform implements Runnable
|
||||
{
|
||||
private final Player _player;
|
||||
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
static void showAdminHtml(Player activeChar, String path)
|
||||
public static void showAdminHtml(Player activeChar, String path)
|
||||
{
|
||||
showHtml(activeChar, "data/html/admin/" + path, false);
|
||||
}
|
||||
|
||||
@@ -452,7 +452,7 @@ public class Wedding implements IVoicedCommandHandler
|
||||
return true;
|
||||
}
|
||||
|
||||
static class EscapeFinalizer implements Runnable
|
||||
private static class EscapeFinalizer implements Runnable
|
||||
{
|
||||
private final Player _player;
|
||||
private final Location _partnerLoc;
|
||||
|
||||
@@ -619,7 +619,7 @@ public class Kamaloka extends AbstractInstance
|
||||
* @param world instanceWorld
|
||||
*/
|
||||
@Override
|
||||
protected final void finishInstance(InstanceWorld world)
|
||||
protected void finishInstance(InstanceWorld world)
|
||||
{
|
||||
if (world instanceof KamaWorld)
|
||||
{
|
||||
@@ -659,7 +659,7 @@ public class Kamaloka extends AbstractInstance
|
||||
* Spawn all NPCs in kamaloka
|
||||
* @param world instanceWorld
|
||||
*/
|
||||
private final void spawnKama(KamaWorld world)
|
||||
private void spawnKama(KamaWorld world)
|
||||
{
|
||||
int[] npcs;
|
||||
int[][] spawns;
|
||||
|
||||
@@ -37,7 +37,7 @@ import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
|
||||
*/
|
||||
public class Q00257_TheGuardIsBusy extends Quest
|
||||
{
|
||||
public static final class MobDrop extends ItemHolder
|
||||
public static class MobDrop extends ItemHolder
|
||||
{
|
||||
private final int _chance;
|
||||
private final int _random;
|
||||
|
||||
@@ -59,7 +59,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
|
||||
PARTY_RANDOM
|
||||
}
|
||||
|
||||
private static final class LevelingInfo
|
||||
private static class LevelingInfo
|
||||
{
|
||||
private final AbsorbCrystalType _absorbCrystalType;
|
||||
private final boolean _isSkillNeeded;
|
||||
@@ -88,7 +88,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
|
||||
}
|
||||
}
|
||||
|
||||
private static final class SoulCrystal
|
||||
private static class SoulCrystal
|
||||
{
|
||||
private final int _level;
|
||||
private final int _itemId;
|
||||
|
||||
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.util.Util;
|
||||
*/
|
||||
public class Q00352_HelpRoodRaiseANewPet extends Quest
|
||||
{
|
||||
private static final class DropInfo
|
||||
private static class DropInfo
|
||||
{
|
||||
public int _firstChance;
|
||||
public int _secondChance;
|
||||
|
||||
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.util.Util;
|
||||
*/
|
||||
public class Q00355_FamilyHonor extends Quest
|
||||
{
|
||||
private static final class DropInfo
|
||||
private static class DropInfo
|
||||
{
|
||||
public int _firstChance;
|
||||
public int _secondChance;
|
||||
|
||||
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.util.Util;
|
||||
*/
|
||||
public class Q00371_ShrieksOfGhosts extends Quest
|
||||
{
|
||||
private static final class DropInfo
|
||||
private static class DropInfo
|
||||
{
|
||||
public int _firstChance;
|
||||
public int _secondChance;
|
||||
|
||||
@@ -452,7 +452,7 @@ public class Q00373_SupplierOfReagents extends Quest
|
||||
return htmltext;
|
||||
}
|
||||
|
||||
private static final class Entry
|
||||
private static class Entry
|
||||
{
|
||||
private final int item;
|
||||
private final String html;
|
||||
|
||||
@@ -486,7 +486,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
|
||||
return player.getInventory().getItemByItemId(fluteItemId);
|
||||
}
|
||||
|
||||
private static final class NpcData
|
||||
private static class NpcData
|
||||
{
|
||||
public NpcStringId message;
|
||||
public int memoStateMod;
|
||||
|
||||
@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.util.Util;
|
||||
*/
|
||||
public class Q00512_BladeUnderFoot extends Quest
|
||||
{
|
||||
private static final class DropInfo
|
||||
private static class DropInfo
|
||||
{
|
||||
public int _firstChance;
|
||||
public int _secondChance;
|
||||
|
||||
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.quest.QuestState;
|
||||
*/
|
||||
public class Q00619_RelicsOfTheOldEmpire extends Quest
|
||||
{
|
||||
private static final class DropInfo
|
||||
private static class DropInfo
|
||||
{
|
||||
public double _dropChance;
|
||||
public int _doubleItemChance;
|
||||
|
||||
@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
|
||||
* Path to Becoming a Lord - Gludio (708)
|
||||
* @author Sacrifice
|
||||
*/
|
||||
public final class Q00708_PathToBecomingALordGludio extends Quest
|
||||
public class Q00708_PathToBecomingALordGludio extends Quest
|
||||
{
|
||||
private static final int SAYRES = 35100;
|
||||
private static final int PINTER = 30298;
|
||||
|
||||
@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
|
||||
* Path to Becoming a Lord - Dion (709)
|
||||
* @author Sacrifice
|
||||
*/
|
||||
public final class Q00709_PathToBecomingALordDion extends Quest
|
||||
public class Q00709_PathToBecomingALordDion extends Quest
|
||||
{
|
||||
private static final int CROSBY = 35142;
|
||||
private static final int ROUKE = 31418;
|
||||
|
||||
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
|
||||
* Path to Becoming a Lord - Giran (710)
|
||||
* @author Sacrifice
|
||||
*/
|
||||
public final class Q00710_PathToBecomingALordGiran extends Quest
|
||||
public class Q00710_PathToBecomingALordGiran extends Quest
|
||||
{
|
||||
private static final int SAUL = 35184;
|
||||
private static final int GESTO = 30511;
|
||||
|
||||
@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
|
||||
* Path to Becoming a Lord - Innadril (711)
|
||||
* @author Sacrifice
|
||||
*/
|
||||
public final class Q00711_PathToBecomingALordInnadril extends Quest
|
||||
public class Q00711_PathToBecomingALordInnadril extends Quest
|
||||
{
|
||||
private static final int NEURATH = 35316;
|
||||
private static final int IASON_HEINE = 30969;
|
||||
|
||||
@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
|
||||
* Path to Becoming a Lord - Oren (712)
|
||||
* @author Sacrifice
|
||||
*/
|
||||
public final class Q00712_PathToBecomingALordOren extends Quest
|
||||
public class Q00712_PathToBecomingALordOren extends Quest
|
||||
{
|
||||
private static final int BRASSEUR = 35226;
|
||||
private static final int CROOP = 30676;
|
||||
|
||||
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
|
||||
* Path to Becoming a Lord - Aden (713)
|
||||
* @author Sacrifice
|
||||
*/
|
||||
public final class Q00713_PathToBecomingALordAden extends Quest
|
||||
public class Q00713_PathToBecomingALordAden extends Quest
|
||||
{
|
||||
private static final int LOGAN = 35274;
|
||||
private static final int ORVEN = 30857;
|
||||
|
||||
@@ -36,7 +36,7 @@ import quests.Q00121_PavelTheGiant.Q00121_PavelTheGiant;
|
||||
* Path to Becoming a Lord - Schuttgart (714)
|
||||
* @author Sacrifice
|
||||
*/
|
||||
public final class Q00714_PathToBecomingALordSchuttgart extends Quest
|
||||
public class Q00714_PathToBecomingALordSchuttgart extends Quest
|
||||
{
|
||||
private static final int AUGUST = 35555;
|
||||
private static final int NEWYEAR = 31961;
|
||||
|
||||
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
|
||||
* Path to Becoming a Lord - Goddard (715)
|
||||
* @author Sacrifice
|
||||
*/
|
||||
public final class Q00715_PathToBecomingALordGoddard extends Quest
|
||||
public class Q00715_PathToBecomingALordGoddard extends Quest
|
||||
{
|
||||
private static final int ALFRED = 35363;
|
||||
|
||||
|
||||
@@ -39,7 +39,7 @@ import quests.Q00025_HidingBehindTheTruth.Q00025_HidingBehindTheTruth;
|
||||
* Path to Becoming a Lord - Rune (716)
|
||||
* @author Sacrifice
|
||||
*/
|
||||
public final class Q00716_PathToBecomingALordRune extends Quest
|
||||
public class Q00716_PathToBecomingALordRune extends Quest
|
||||
{
|
||||
private static final int FREDERICK = 35509;
|
||||
private static final int AGRIPEL = 31348;
|
||||
|
||||
@@ -169,7 +169,7 @@ public class Q10276_MutatedKaneusGludio extends Quest
|
||||
* @param npcId the ID of the killed monster
|
||||
* @param player
|
||||
*/
|
||||
private final void rewardItem(int npcId, Player player)
|
||||
private void rewardItem(int npcId, Player player)
|
||||
{
|
||||
if ((npcId == TOMLAN_KAMOS) && !hasQuestItems(player, TISSUE_TK))
|
||||
{
|
||||
|
||||
@@ -169,7 +169,7 @@ public class Q10277_MutatedKaneusDion extends Quest
|
||||
* @param npcId the ID of the killed monster
|
||||
* @param player
|
||||
*/
|
||||
private final void rewardItem(int npcId, Player player)
|
||||
private void rewardItem(int npcId, Player player)
|
||||
{
|
||||
if ((npcId == CRIMSON_HATU) && !hasQuestItems(player, TISSUE_CH))
|
||||
{
|
||||
|
||||
@@ -169,7 +169,7 @@ public class Q10278_MutatedKaneusHeine extends Quest
|
||||
* @param npcId the ID of the killed monster
|
||||
* @param player
|
||||
*/
|
||||
private final void rewardItem(int npcId, Player player)
|
||||
private void rewardItem(int npcId, Player player)
|
||||
{
|
||||
if ((npcId == BLADE_OTIS) && !hasQuestItems(player, TISSUE_BO))
|
||||
{
|
||||
|
||||
@@ -169,7 +169,7 @@ public class Q10279_MutatedKaneusOren extends Quest
|
||||
* @param npcId the ID of the killed monster
|
||||
* @param player
|
||||
*/
|
||||
private final void rewardItem(int npcId, Player player)
|
||||
private void rewardItem(int npcId, Player player)
|
||||
{
|
||||
if ((npcId == KAIM_ABIGORE) && !hasQuestItems(player, TISSUE_KA))
|
||||
{
|
||||
|
||||
@@ -169,7 +169,7 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
|
||||
* @param npcId the ID of the killed monster
|
||||
* @param player
|
||||
*/
|
||||
private final void rewardItem(int npcId, Player player)
|
||||
private void rewardItem(int npcId, Player player)
|
||||
{
|
||||
if ((npcId == VENOMOUS_STORACE) && !hasQuestItems(player, TISSUE_VS))
|
||||
{
|
||||
|
||||
@@ -162,7 +162,7 @@ public class Q10281_MutatedKaneusRune extends Quest
|
||||
return htmltext;
|
||||
}
|
||||
|
||||
private final void rewardItem(Player player)
|
||||
private void rewardItem(Player player)
|
||||
{
|
||||
giveItems(player, TISSUE_WA, 1);
|
||||
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
|
||||
|
||||
Reference in New Issue
Block a user