More protected replacements.

This commit is contained in:
MobiusDev
2016-01-29 15:32:47 +00:00
parent 9f74036626
commit c09085f2b4
14 changed files with 41 additions and 39 deletions

View File

@ -35,7 +35,7 @@ import ai.npc.AbstractNpcAI;
final class Parade extends AbstractNpcAI
{
// @formatter:off
protected final int[] ACTORS =
final int[] ACTORS =
{
32379, 0, 32379,
32379, 0, 32379,
@ -141,13 +141,13 @@ final class Parade extends AbstractNpcAI
_log.info("Fantasy Isle: Parade starting at " + format.format(System.currentTimeMillis() + diff) + " and is scheduled each next " + (cycle / 3600000) + " hours.");
}
protected void load()
void load()
{
npcIndex = 0;
spawns = new CopyOnWriteArrayList<>();
}
protected void clean()
void clean()
{
if (spawns != null)
{

View File

@ -60,7 +60,7 @@ final class BeastFarm extends AbstractNpcAI
18872
};
private static final int TAME_CHANCE = 20;
protected static final int[] SPECIAL_SPICE_CHANCES =
static final int[] SPECIAL_SPICE_CHANCES =
{
33,
75

View File

@ -38,7 +38,7 @@ import ai.npc.AbstractNpcAI;
final class DenOfEvil extends AbstractNpcAI
{
// private static final int _buffer_id = 32656;
protected static final int[] EYE_IDS =
static final int[] EYE_IDS =
{
18812,
18813,

View File

@ -56,7 +56,7 @@ final class PolymorphingOnAttack extends AbstractNpcAI
MOBSPAWNS.put(21537, Arrays.asList(21538, 100, 30, -1)); // Fang of Splendor
}
protected static final NpcStringId[][] MOBTEXTS =
private static final NpcStringId[][] MOBTEXTS =
{
new NpcStringId[]
{

View File

@ -105,22 +105,22 @@ final class SelMahumDrill extends AbstractNpcAI
_repeatInterval = repeatInterval;
}
protected int getSocialActionId()
int getSocialActionId()
{
return _socialActionId;
}
protected int getAltSocialActionId()
int getAltSocialActionId()
{
return _altSocialActionId;
}
protected int getRepeatCount()
int getRepeatCount()
{
return _repeatCount;
}
protected int getRepeatInterval()
int getRepeatInterval()
{
return _repeatInterval;
}

View File

@ -85,7 +85,7 @@ final class MentorGuide extends AbstractNpcAI implements IXmlReader
new SkillHolder(9233, 1), // Mentor's Guidance
};
protected static final SkillHolder[] MENTOR_BUFFS =
private static final SkillHolder[] MENTOR_BUFFS =
{
new SkillHolder(9256, 1), // Mentee's Appreciation;
};

View File

@ -34,7 +34,7 @@ class NpcBufferAI implements Runnable
private final L2Npc _npc;
private final NpcBufferSkillData _skillData;
protected NpcBufferAI(L2Npc npc, NpcBufferSkillData skill)
NpcBufferAI(L2Npc npc, NpcBufferSkillData skill)
{
_npc = npc;
_skillData = skill;

View File

@ -36,7 +36,7 @@ class NpcBuffersData implements IXmlReader
{
private final Map<Integer, NpcBufferData> _npcBuffers = new HashMap<>();
protected NpcBuffersData()
NpcBuffersData()
{
load();
}

View File

@ -158,7 +158,7 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
{
private final L2Clan _winner;
protected SiegeEnd(L2Clan winner)
SiegeEnd(L2Clan winner)
{
_winner = winner;
}
@ -243,7 +243,7 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
new Location(155657, -125752, -2214), // Arena 4
};
protected static final int[] ARENA_ZONES =
static final int[] ARENA_ZONES =
{
112081,
112082,
@ -260,13 +260,15 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
private static final Skill[] DEBUFFS = {};
protected static Map<Integer, Long> _warDecreesCount = new HashMap<>();
protected static List<L2Clan> _acceptedClans = new ArrayList<>(4);
static Map<Integer, Long> _warDecreesCount = new HashMap<>();
static List<L2Clan> _acceptedClans = new ArrayList<>(4);
private static Map<String, ArrayList<L2Clan>> _usedTextPassages = new HashMap<>();
private static Map<L2Clan, Integer> _pendingItemToGet = new HashMap<>();
protected static SiegableHall _rainbow;
protected static ScheduledFuture<?> _nextSiege, _siegeEnd;
static SiegableHall _rainbow;
static ScheduledFuture<?> _nextSiege;
static ScheduledFuture<?> _siegeEnd;
private static String _registrationEnds;
public RainbowSpringsChateau()
@ -716,7 +718,7 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
}
protected static void spawnGourds()
static void spawnGourds()
{
for (int i = 0; i < _acceptedClans.size(); i++)
{
@ -741,7 +743,7 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
}
protected static void unSpawnGourds()
static void unSpawnGourds()
{
for (int i = 0; i < _acceptedClans.size(); i++)
{
@ -889,7 +891,7 @@ final class RainbowSpringsChateau extends ClanHallSiegeEngine
}
}
protected static void setRegistrationEndString(long time)
static void setRegistrationEndString(long time)
{
final Calendar c = Calendar.getInstance();
c.setTime(new Date(time));

View File

@ -142,7 +142,7 @@ final class Race extends Event
return true;
}
protected void StartRace()
private void StartRace()
{
// Abort race if no players signup
if (_players.isEmpty())
@ -381,7 +381,7 @@ final class Race extends Event
activeChar.sendPacket(html);
}
protected void timeUp()
private void timeUp()
{
Broadcast.toAllOnlinePlayers("Time up, nobody wins!");
eventStop();

View File

@ -722,10 +722,10 @@ public class EnergySeeds extends AbstractNpcAI
private class ESSpawn
{
protected final int _spawnId;
protected final GraciaSeeds _seedId;
protected final int[] _npcIds;
protected final Location _loc;
final GraciaSeeds _seedId;
private final int _spawnId;
private final int[] _npcIds;
private final Location _loc;
public ESSpawn(int spawnId, GraciaSeeds seedId, Location loc, int[] npcIds)
{

View File

@ -120,7 +120,7 @@ public class Unstuck implements IUserCommandHandler
{
private final L2PcInstance _activeChar;
protected EscapeFinalizer(L2PcInstance activeChar)
EscapeFinalizer(L2PcInstance activeChar)
{
_activeChar = activeChar;
}

View File

@ -113,14 +113,14 @@ public final class CrystalCaverns extends AbstractInstance
public List<L2Npc> guards = new ArrayList<>();
public List<L2Npc> oracle = new ArrayList<>();
// baylor variables
protected final List<L2PcInstance> _raiders = new ArrayList<>();
protected int _raidStatus = 0;
protected long _dragonClawStart = 0;
protected int _dragonClawNeed = 0;
protected final List<L2Npc> _animationMobs = new ArrayList<>();
protected L2Npc _camera = null;
protected L2Npc _baylor = null;
protected L2Npc _alarm = null;
final List<L2PcInstance> _raiders = new ArrayList<>();
int _raidStatus = 0;
long _dragonClawStart = 0;
int _dragonClawNeed = 0;
final List<L2Npc> _animationMobs = new ArrayList<>();
L2Npc _camera = null;
L2Npc _baylor = null;
L2Npc _alarm = null;
public CCWorld(Long time)
{
@ -872,7 +872,7 @@ public final class CrystalCaverns extends AbstractInstance
}
/*
* protected void runBaylorRoom(CCWorld world) { world.status = 30; addSpawn(29101,152758,143479,-12706,52961,false,0,false,world.getInstanceId(),0);//up power addSpawn(29101,151951,142078,-12706,65203,false,0,false,world.getInstanceId(),0);//up power
* private void runBaylorRoom(CCWorld world) { world.status = 30; addSpawn(29101,152758,143479,-12706,52961,false,0,false,world.getInstanceId(),0);//up power addSpawn(29101,151951,142078,-12706,65203,false,0,false,world.getInstanceId(),0);//up power
* addSpawn(29101,154396,140667,-12706,22197,false,0,false,world.getInstanceId(),0);//up power addSpawn(29102,152162,141249,-12706,5511,false,0,false,world.getInstanceId(),0);//down power addSpawn(29102,153571,140458,-12706,16699,false,0,false,world.getInstanceId(),0);//down power
* addSpawn(29102,154976,141265,-12706,26908,false,0,false,world.getInstanceId(),0);//down power addSpawn(29102,155203,142071,-12706,31560,false,0,false,world.getInstanceId(),0);//down power addSpawn(29102,154380,143468,-12708,43943,false,0,false,world.getInstanceId(),0);//down power
* addSpawn(32271,153573,142069,-9722,11175,false,0,false,world.getInstanceId()); world.Baylor = addSpawn(BAYLOR,153557,142089,-12735,11175,false,0,false,world.getInstanceId(),0); }

View File

@ -783,7 +783,7 @@ public final class FinalEmperialTomb extends AbstractInstance
{
private final L2Npc _npc;
protected SoulBreakingArrow(L2Npc npc)
SoulBreakingArrow(L2Npc npc)
{
_npc = npc;
}