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

Code review Part 5.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-12-22 15:33:46 +00:00
parent 4a563b8832
commit 7f3befa63c
4071 changed files with 23938 additions and 28938 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/MonasteryOfSilence/MonasteryOfSilence.java
Vendored
+5 -5
View File
@@ -81,7 +81,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
case 22124:
case 22126:
{
Skill skill = SkillData.getInstance().getSkill(4589, 8);
final Skill skill = SkillData.getInstance().getSkill(4589, 8);
npc.doCast(skill);
break;
}
@@ -129,7 +129,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
{
if (CommonUtil.contains(mobs1, npc.getId()))
{
ArrayList<Playable> result = new ArrayList<>();
final ArrayList<Playable> result = new ArrayList<>();
for (WorldObject obj : World.getInstance().getVisibleObjects(npc, WorldObject.class))
{
if ((obj instanceof PlayerInstance) || (obj instanceof PetInstance))
@@ -142,10 +142,10 @@ public class MonasteryOfSilence extends AbstractNpcAI
}
if (!result.isEmpty() && (result.size() != 0))
{
Object[] characters = result.toArray();
final Object[] characters = result.toArray();
for (Object obj : characters)
{
Playable target = (Playable) (obj instanceof PlayerInstance ? obj : ((Summon) obj).getOwner());
final Playable target = (Playable) (obj instanceof PlayerInstance ? obj : ((Summon) obj).getOwner());
if ((target.getActiveWeaponInstance() != null) && !npc.isInCombat() && (npc.getTarget() == null))
{
npc.setTarget(target);
@@ -156,7 +156,7 @@ public class MonasteryOfSilence extends AbstractNpcAI
case 22126:
case 22127:
{
Skill skill = SkillData.getInstance().getSkill(4589, 8);
final Skill skill = SkillData.getInstance().getSkill(4589, 8);
npc.doCast(skill);
break;
}
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
Vendored
+25 -25
View File
@@ -261,7 +261,7 @@ public class Frintezza extends AbstractNpcAI
private Frintezza()
{
int[] mob =
final int[] mob =
{
SCARLET1,
SCARLET2,
@@ -289,11 +289,11 @@ public class Frintezza extends AbstractNpcAI
addTalkId(GUIDE);
addStartNpc(CUBE);
addTalkId(CUBE);
StatsSet info = GrandBossManager.getInstance().getStatsSet(FRINTEZZA);
int status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(FRINTEZZA);
final int status = GrandBossManager.getInstance().getBossStatus(FRINTEZZA);
if (status == DEAD)
{
long temp = (info.getLong("respawn_time") - System.currentTimeMillis());
final long temp = (info.getLong("respawn_time") - System.currentTimeMillis());
if (temp > 0)
{
startQuestTimer("frintezza_unlock", temp, null, null);
@@ -330,7 +330,7 @@ public class Frintezza extends AbstractNpcAI
{
for (int i = 0; i <= 17; i++)
{
Npc mob = addSpawn(_mobLoc[i][0], _mobLoc[i][1], _mobLoc[i][2], _mobLoc[i][3], _mobLoc[i][4], false, 0);
final Npc mob = addSpawn(_mobLoc[i][0], _mobLoc[i][1], _mobLoc[i][2], _mobLoc[i][3], _mobLoc[i][4], false, 0);
_room1Mobs.add(mob);
}
}
@@ -338,7 +338,7 @@ public class Frintezza extends AbstractNpcAI
{
for (int i = 18; i <= 26; i++)
{
Npc mob = addSpawn(_mobLoc[i][0], _mobLoc[i][1], _mobLoc[i][2], _mobLoc[i][3], _mobLoc[i][4], false, 0);
final Npc mob = addSpawn(_mobLoc[i][0], _mobLoc[i][1], _mobLoc[i][2], _mobLoc[i][3], _mobLoc[i][4], false, 0);
_room1Mobs.add(mob);
}
}
@@ -346,7 +346,7 @@ public class Frintezza extends AbstractNpcAI
{
for (int i = 27; i <= 32; i++)
{
Npc mob = addSpawn(_mobLoc[i][0], _mobLoc[i][1], _mobLoc[i][2], _mobLoc[i][3], _mobLoc[i][4], false, 0);
final Npc mob = addSpawn(_mobLoc[i][0], _mobLoc[i][1], _mobLoc[i][2], _mobLoc[i][3], _mobLoc[i][4], false, 0);
_room1Mobs.add(mob);
}
}
@@ -354,7 +354,7 @@ public class Frintezza extends AbstractNpcAI
{
for (int i = 33; i <= 40; i++)
{
Npc mob = addSpawn(_mobLoc[i][0], _mobLoc[i][1], _mobLoc[i][2], _mobLoc[i][3], _mobLoc[i][4], false, 0);
final Npc mob = addSpawn(_mobLoc[i][0], _mobLoc[i][1], _mobLoc[i][2], _mobLoc[i][3], _mobLoc[i][4], false, 0);
_room1Mobs.add(mob);
}
}
@@ -362,7 +362,7 @@ public class Frintezza extends AbstractNpcAI
{
for (int i = 41; i <= 44; i++)
{
Npc mob = addSpawn(_mobLoc[i][0], _mobLoc[i][1], _mobLoc[i][2], _mobLoc[i][3], _mobLoc[i][4], false, 0);
final Npc mob = addSpawn(_mobLoc[i][0], _mobLoc[i][1], _mobLoc[i][2], _mobLoc[i][3], _mobLoc[i][4], false, 0);
_room2Mobs.add(mob);
}
}
@@ -370,7 +370,7 @@ public class Frintezza extends AbstractNpcAI
{
for (int i = 45; i <= 131; i++)
{
Npc mob = addSpawn(_mobLoc[i][0], _mobLoc[i][1], _mobLoc[i][2], _mobLoc[i][3], _mobLoc[i][4], false, 0);
final Npc mob = addSpawn(_mobLoc[i][0], _mobLoc[i][1], _mobLoc[i][2], _mobLoc[i][3], _mobLoc[i][4], false, 0);
_room2Mobs.add(mob);
}
}
@@ -806,7 +806,7 @@ public class Frintezza extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("stop_npc"))
{
int heading = npc.getHeading();
final int heading = npc.getHeading();
if (heading < 32768)
{
_angle = Math.abs(180 - (int) (heading / 182.044444444));
@@ -854,7 +854,7 @@ public class Frintezza extends AbstractNpcAI
else if (event.equalsIgnoreCase("morph_04"))
{
_zone.broadcastPacket(new SocialAction(_weakScarlet.getObjectId(), 4));
Skill skill = SkillData.getInstance().getSkill(5017, 1);
final Skill skill = SkillData.getInstance().getSkill(5017, 1);
if (skill != null)
{
skill.applyEffects(_weakScarlet, _weakScarlet);
@@ -955,7 +955,7 @@ public class Frintezza extends AbstractNpcAI
else if (event.equalsIgnoreCase("morph_15"))
{
_zone.broadcastPacket(new SocialAction(_strongScarlet.getObjectId(), 2));
Skill skill = SkillData.getInstance().getSkill(5017, 1);
final Skill skill = SkillData.getInstance().getSkill(5017, 1);
if (skill != null)
{
skill.applyEffects(_strongScarlet, _strongScarlet);
@@ -1039,7 +1039,7 @@ public class Frintezza extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("songs_effect"))
{
Skill skill = SkillData.getInstance().getSkill(5008, _onSong);
final Skill skill = SkillData.getInstance().getSkill(5008, _onSong);
if (skill == null)
{
return null;
@@ -1139,8 +1139,8 @@ public class Frintezza extends AbstractNpcAI
{
if ((_weakScarlet != null) && !_weakScarlet.isDead() && (_secondMorph == 0) && (_thirdMorph == 0) && (_onMorph == 0))
{
int i = Rnd.get(0, 1);
Skill skill = SkillData.getInstance().getSkill(_skill[i][0], _skill[i][1]);
final int i = Rnd.get(0, 1);
final Skill skill = SkillData.getInstance().getSkill(_skill[i][0], _skill[i][1]);
if (skill != null)
{
_weakScarlet.stopMove(null);
@@ -1164,7 +1164,7 @@ public class Frintezza extends AbstractNpcAI
i = Rnd.get(2, 4);
}
Skill skill = SkillData.getInstance().getSkill(_skill[i][0], _skill[i][1]);
final Skill skill = SkillData.getInstance().getSkill(_skill[i][0], _skill[i][1]);
if (skill != null)
{
_weakScarlet.stopMove(null);
@@ -1194,7 +1194,7 @@ public class Frintezza extends AbstractNpcAI
i = Rnd.get(6, 9);
}
Skill skill = SkillData.getInstance().getSkill(_skill[i][0], _skill[i][1]);
final Skill skill = SkillData.getInstance().getSkill(_skill[i][0], _skill[i][1]);
if (skill != null)
{
_strongScarlet.stopMove(null);
@@ -1285,7 +1285,7 @@ public class Frintezza extends AbstractNpcAI
{
for (int i = 0; i < _minions.size(); i++)
{
Attackable mob = _minions.get(i);
final Attackable mob = _minions.get(i);
if (mob != null)
{
mob.decayMe();
@@ -1297,7 +1297,7 @@ public class Frintezza extends AbstractNpcAI
{
if ((npc != null) && !npc.isDead() && (_frintezza != null) && !_frintezza.isDead())
{
Npc mob = addSpawn(npc.getId() + 2, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), false, 0);
final Npc mob = addSpawn(npc.getId() + 2, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), false, 0);
// mob.setIsRaidMinion(true);
_minions.add((Attackable) mob);
@@ -1326,8 +1326,8 @@ public class Frintezza extends AbstractNpcAI
{
if (npc.getId() == CUBE)
{
int x = 150037 + Rnd.get(500);
int y = -57720 + Rnd.get(500);
final int x = 150037 + Rnd.get(500);
final int y = -57720 + Rnd.get(500);
player.teleToLocation(x, y, -2976);
return null;
}
@@ -1368,7 +1368,7 @@ public class Frintezza extends AbstractNpcAI
else
{
player.destroyItemByItemId("Quest", 8073, 1, player, true);
CommandChannel cc = player.getParty().getCommandChannel();
final CommandChannel cc = player.getParty().getCommandChannel();
GrandBossManager.getInstance().setBossStatus(FRINTEZZA, WAITING);
startQuestTimer("close", 0, npc, null);
@@ -1466,7 +1466,7 @@ public class Frintezza extends AbstractNpcAI
_bomber = 1;
startQuestTimer("bomber", 3000, npc, null);
Skill skill = SkillData.getInstance().getSkill(5011, 1);
final Skill skill = SkillData.getInstance().getSkill(5011, 1);
if (skill != null)
{
npc.setIsCastingNow(true);
@@ -1508,7 +1508,7 @@ public class Frintezza extends AbstractNpcAI
startQuestTimer("frintezza_unlock", respawnTime, npc, null);
// also save the respawn time so that the info is maintained past reboots
StatsSet info = GrandBossManager.getInstance().getStatsSet(FRINTEZZA);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(FRINTEZZA);
info.set("respawn_time", System.currentTimeMillis() + respawnTime);
GrandBossManager.getInstance().setStatsSet(FRINTEZZA, info);
}
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
Vendored
+2 -2
View File
@@ -126,8 +126,8 @@ public class Orfen extends AbstractNpcAI
final int loc_y = info.getInt("loc_y");
final int loc_z = info.getInt("loc_z");
final int heading = info.getInt("heading");
double hp = info.getDouble("currentHP");
double mp = info.getDouble("currentMP");
final double hp = info.getDouble("currentHP");
final double mp = info.getDouble("currentMP");
final GrandBossInstance orfen = (GrandBossInstance) addSpawn(ORFEN, loc_x, loc_y, loc_z, heading, false, 0);
orfen.setCurrentHpMp(hp, mp);
spawnBoss(orfen);
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/QueenAnt/QueenAnt.java
Vendored
+2 -2
View File
@@ -114,8 +114,8 @@ public class QueenAnt extends AbstractNpcAI
final int loc_y = QUEEN_Y;
final int loc_z = QUEEN_Z;
final int heading = info.getInt("heading");
double hp = info.getDouble("currentHP");
double mp = info.getDouble("currentMP");
final double hp = info.getDouble("currentHP");
final double mp = info.getDouble("currentMP");
final GrandBossInstance queen = (GrandBossInstance) addSpawn(QUEEN, loc_x, loc_y, loc_z, heading, false, 0);
queen.setCurrentHpMp(hp, mp);
spawnBoss(queen);
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Chests.java
Vendored
+5 -5
View File
@@ -79,7 +79,7 @@ public class Chests extends AbstractNpcAI
{
return super.onSkillSee(npc, caster, skill, targets, isSummon);
}
ChestInstance chest = ((ChestInstance) npc);
final ChestInstance chest = ((ChestInstance) npc);
// if this has already been interacted, no further ai decisions are needed
// if it's the first interaction, check if this is a box or mimic
@@ -96,7 +96,7 @@ public class Chests extends AbstractNpcAI
{
keyLevelNeeded *= -1;
}
int chance = BASE_CHANCE - (keyLevelNeeded * LEVEL_DECREASE);
final int chance = BASE_CHANCE - (keyLevelNeeded * LEVEL_DECREASE);
// success, pretend-death with rewards: chest.reduceCurrentHp(99999999, player)
if (getRandom(100) < chance)
@@ -111,7 +111,7 @@ public class Chests extends AbstractNpcAI
}
else
{
Creature originalCaster = isSummon ? caster.getSummon() : caster;
final Creature originalCaster = isSummon ? caster.getSummon() : caster;
chest.setRunning();
chest.addDamageHate(originalCaster, 0, 999);
chest.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, originalCaster);
@@ -126,7 +126,7 @@ public class Chests extends AbstractNpcAI
{
if (npc instanceof ChestInstance)
{
ChestInstance chest = ((ChestInstance) npc);
final ChestInstance chest = ((ChestInstance) npc);
// if this was a mimic, set the target, start the skills and become agro
if (!chest.isInteracted())
{
@@ -139,7 +139,7 @@ public class Chests extends AbstractNpcAI
{
// if this weren't a box, upon interaction start the mimic behaviors...
// TODO: perhaps a self-buff (skill id 4245) with random chance goes here?
Creature originalAttacker = isSummon ? attacker.getSummon() : attacker;
final Creature originalAttacker = isSummon ? attacker.getSummon() : attacker;
chest.setRunning();
chest.addDamageHate(originalAttacker, 0, (damage * 100) / (chest.getLevel() + 7));
chest.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, originalAttacker);
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java
Vendored
+2 -2
View File
@@ -73,7 +73,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
public boolean useBypass(String command, PlayerInstance player, Creature target)
{
String cmd = "";
StringBuilder params = new StringBuilder();
final StringBuilder params = new StringBuilder();
final StringTokenizer st = new StringTokenizer(command, " ");
if (st.hasMoreTokens())
@@ -130,7 +130,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
}
else
{
StringBuilder title = new StringBuilder();
final StringBuilder title = new StringBuilder();
title.append("BUFF SELL: ");
final StringTokenizer st = new StringTokenizer(params, " ");
while (st.hasMoreTokens())
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
Vendored
+6 -6
View File
@@ -80,7 +80,7 @@ public class CharacterBirthday extends AbstractNpcAI
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
String htmltext = "";
QuestState st = getQuestState(player, false);
final QuestState st = getQuestState(player, false);
htmltext = event;
if (event.equalsIgnoreCase("despawn_npc"))
@@ -91,10 +91,10 @@ public class CharacterBirthday extends AbstractNpcAI
}
if (event.equalsIgnoreCase("receive_reward"))
{
Calendar now = Calendar.getInstance();
final Calendar now = Calendar.getInstance();
now.setTimeInMillis(System.currentTimeMillis());
// Check if already received reward
String nextBirthday = st.get("Birthday");
final String nextBirthday = st.get("Birthday");
if ((nextBirthday != null) && (Integer.parseInt(nextBirthday) > now.get(Calendar.YEAR)))
{
htmltext = "32600-already.htm";
@@ -135,12 +135,12 @@ public class CharacterBirthday extends AbstractNpcAI
return null;
}
QuestState st = getQuestState(player, true);
final QuestState st = getQuestState(player, true);
if ((st != null) && (player.checkBirthDay() == 0))
{
player.sendPacket(new PlaySound(1, "HB01", 0, 0, 0, 0, 0));
Npc spawned = addSpawn(32600, player.getX() + 10, player.getY() + 10, player.getZ() + 10, 0, false, 0, true);
final Npc spawned = addSpawn(32600, player.getX() + 10, player.getY() + 10, player.getZ() + 10, 0, false, 0, true);
st.setState(State.STARTED);
startQuestTimer("despawn_npc", 60000, spawned, null);
HAS_SPAWNED = true;
@@ -160,7 +160,7 @@ public class CharacterBirthday extends AbstractNpcAI
QuestState st = player.getQuestState(getName());
if (st == null)
{
Quest q = QuestManager.getInstance().getQuest(getName());
final Quest q = QuestManager.getInstance().getQuest(getName());
st = q.newQuestState(player);
}
if (player.checkBirthDay() == 0)
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/L2Day/L2Day.java
Vendored
+1 -1
View File
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.quest.LongTimeEvent;
public class L2Day extends LongTimeEvent
{
// NPCs
private static final Map<Integer, Integer> MANAGERS = new HashMap<>();
private static final Map<Integer, Integer> MANAGERS = new HashMap<>();
static
{
MANAGERS.put(31854, 7117); // Talking Island Village
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
Vendored
+18 -18
View File
@@ -199,7 +199,7 @@ public class SavingSanta extends LongTimeEvent
continue;
}
int result = pl.getEffectList().getBuffInfoBySkillId(23019).getSkill().getLevel() - skill.getLevel();
final int result = pl.getEffectList().getBuffInfoBySkillId(23019).getSkill().getLevel() - skill.getLevel();
if (result == 0)
{
@@ -216,7 +216,7 @@ public class SavingSanta extends LongTimeEvent
}
else if ((result == 1) || (result == -2))
{
int level = (pl.isAffectedBySkill(23022) ? (pl.getEffectList().getBuffInfoBySkillId(23022).getSkill().getLevel() + 1) : 1);
final int level = (pl.isAffectedBySkill(23022) ? (pl.getEffectList().getBuffInfoBySkillId(23022).getSkill().getLevel() + 1) : 1);
pl.broadcastPacket(new MagicSkillUse(pl, pl, 23022, level, 3000, 1));
SkillData.getInstance().getSkill(23022, level).applyEffects(pl, pl);
@@ -324,7 +324,7 @@ public class SavingSanta extends LongTimeEvent
{
if (_rewardedPlayers.containsKey(pl.getAccountName()))
{
long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName());
final long elapsedTimeSinceLastRewarded = System.currentTimeMillis() - _rewardedPlayers.get(pl.getAccountName());
if (elapsedTimeSinceLastRewarded < MIN_TIME_BETWEEN_2_REWARDS)
{
continue;
@@ -339,10 +339,10 @@ public class SavingSanta extends LongTimeEvent
continue;
}
}
int locx = (int) (pl.getX() + (Math.pow(-1, getRandom(1, 2)) * 50));
int locy = (int) (pl.getY() + (Math.pow(-1, getRandom(1, 2)) * 50));
int heading = Util.calculateHeadingFrom(locx, locy, pl.getX(), pl.getY());
Npc santa = addSpawn(HOLIDAY_SANTA_ID, locx, locy, pl.getZ(), heading, false, 30000);
final int locx = (int) (pl.getX() + (Math.pow(-1, getRandom(1, 2)) * 50));
final int locy = (int) (pl.getY() + (Math.pow(-1, getRandom(1, 2)) * 50));
final int heading = Util.calculateHeadingFrom(locx, locy, pl.getX(), pl.getY());
final Npc santa = addSpawn(HOLIDAY_SANTA_ID, locx, locy, pl.getZ(), heading, false, 30000);
_rewardedPlayers.put(pl.getAccountName(), System.currentTimeMillis());
player.getVariables().set("LAST_SANTA_REWARD", System.currentTimeMillis());
startQuestTimer("SantaRewarding0", 500, santa, pl);
@@ -446,7 +446,7 @@ public class SavingSanta extends LongTimeEvent
{
if (_blessedPlayers.containsKey(plb.getAccountName()))
{
long elapsedTimeSinceLastBlessed = currentTime - _blessedPlayers.get(plb.getAccountName());
final long elapsedTimeSinceLastBlessed = currentTime - _blessedPlayers.get(plb.getAccountName());
if (elapsedTimeSinceLastBlessed < MIN_TIME_BETWEEN_2_BLESSINGS)
{
continue;
@@ -504,12 +504,12 @@ public class SavingSanta extends LongTimeEvent
{
for (PlayerInstance playerr : World.getInstance().getVisibleObjects(tree, PlayerInstance.class))
{
int xxMin = tree.getX() - 60;
int yyMin = tree.getY() - 60;
int xxMax = tree.getX() + 60;
int yyMax = tree.getY() + 60;
int playerX = playerr.getX();
int playerY = playerr.getY();
final int xxMin = tree.getX() - 60;
final int yyMin = tree.getY() - 60;
final int xxMax = tree.getX() + 60;
final int yyMax = tree.getY() + 60;
final int playerX = playerr.getX();
final int playerY = playerr.getY();
if ((playerX > xxMin) && (playerX < xxMax) && (playerY > yyMin) && (playerY < yyMax))
{
@@ -528,7 +528,7 @@ public class SavingSanta extends LongTimeEvent
for (ItemHolder item : TREE_REQUIRED_ITEMS)
{
long pieceCount = player.getInventory().getInventoryItemCount(item.getId(), -1);
final long pieceCount = player.getInventory().getInventoryItemCount(item.getId(), -1);
if (pieceCount >= item.getCount())
{
itemsOk = itemsOk + 1;
@@ -573,7 +573,7 @@ public class SavingSanta extends LongTimeEvent
else if (event.equalsIgnoreCase("SpecialTree"))
{
htmltext = "<html><title>Christmas Event</title><body><br><br><table width=260><tr><td></td><td width=40></td><td width=40></td></tr><tr><td><font color=LEVEL>Special Christmas Tree</font></td><td width=40><img src=\"Icon.etc_x_mas_tree_i00\" width=32 height=32></td><td width=40></td></tr></table><br><br><table width=260>";
long pieceCount = player.getInventory().getInventoryItemCount(X_MAS_TREE1, -1);
final long pieceCount = player.getInventory().getInventoryItemCount(X_MAS_TREE1, -1);
int itemsOk = 0;
if (pieceCount >= 10)
@@ -613,7 +613,7 @@ public class SavingSanta extends LongTimeEvent
else if (event.equalsIgnoreCase("SantaHat"))
{
htmltext = "<html><title>Christmas Event</title><body><br><br><table width=260><tr><td></td><td width=40></td><td width=40></td></tr><tr><td><font color=LEVEL>Santa's Hat</font></td><td width=40><img src=\"Icon.Accessory_santas_cap_i00\" width=32 height=32></td><td width=40></td></tr></table><br><br><table width=260>";
long pieceCount = player.getInventory().getInventoryItemCount(X_MAS_TREE1, -1);
final long pieceCount = player.getInventory().getInventoryItemCount(X_MAS_TREE1, -1);
int itemsOk = 0;
if (pieceCount >= 10)
@@ -651,7 +651,7 @@ public class SavingSanta extends LongTimeEvent
else if (event.equalsIgnoreCase("SavingSantaHat"))
{
htmltext = "<html><title>Christmas Event</title><body><br><br><table width=260><tr><td></td><td width=40></td><td width=40></td></tr><tr><td><font color=LEVEL>Saving Santa's Hat</font></td><td width=40><img src=\"Icon.Accessory_santas_cap_i00\" width=32 height=32></td><td width=40></td></tr></table><br><br><table width=260>";
long pieceCount = player.getInventory().getAdena();
final long pieceCount = player.getInventory().getAdena();
int itemsOk = 0;
if (pieceCount >= 50000)
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java
Vendored
+2 -2
View File
@@ -87,9 +87,9 @@ public class SkillTransfer extends AbstractNpcAI
return;
}
int pomanderId = PORMANDERS[index].getId();
final int pomanderId = PORMANDERS[index].getId();
// remove unsused HolyPomander
PlayerInventory inv = player.getInventory();
final PlayerInventory inv = player.getInventory();
for (ItemInstance itemI : inv.getAllItemsByItemId(pomanderId))
{
inv.destroyItem("[HolyPomander - remove]", itemI, player, null);
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
Vendored
+2 -2
View File
@@ -251,8 +251,8 @@ public class AdminBuffs implements IAdminCommandHandler
html.append(target.getName());
html.append("</font></td><td width=45><button value=\"Back\" action=\"bypass -h admin_current_player\" width=45 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table><br><table width=\"100%\"><tr><td width=200>Skill</td><td width=30>Rem. Time</td><td width=70>Action</td></tr>");
int start = ((page - 1) * PAGE_LIMIT);
int end = Math.min(((page - 1) * PAGE_LIMIT) + PAGE_LIMIT, effects.size());
final int start = ((page - 1) * PAGE_LIMIT);
final int end = Math.min(((page - 1) * PAGE_LIMIT) + PAGE_LIMIT, effects.size());
int count = 0;
for (BuffInfo info : effects)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
Vendored
+1 -1
View File
@@ -100,7 +100,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler
if (cw.isActivated())
{
PlayerInstance pl = cw.getPlayer();
final PlayerInstance pl = cw.getPlayer();
replyMSG.append("<tr><td>Weilder:</td><td>");
replyMSG.append(pl == null ? "null" : pl.getName());
replyMSG.append("</td></tr>");
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGamePoints.java
Vendored
+7 -7
View File
@@ -45,7 +45,7 @@ public class AdminGamePoints implements IAdminCommandHandler
{
try
{
String val = command.substring(22);
final String val = command.substring(22);
if (!addGamePoints(activeChar, val))
{
BuilderUtil.sendSysMessage(activeChar, "Usage: //add_game_points count");
@@ -60,7 +60,7 @@ public class AdminGamePoints implements IAdminCommandHandler
{
if ((activeChar.getTarget() != null) && activeChar.getTarget().isPlayer())
{
PlayerInstance target = (PlayerInstance) activeChar.getTarget();
final PlayerInstance target = (PlayerInstance) activeChar.getTarget();
activeChar.sendMessage(target.getName() + " has a total of " + target.getGamePoints() + " game points.");
}
else
@@ -76,7 +76,7 @@ public class AdminGamePoints implements IAdminCommandHandler
{
try
{
String val = command.substring(22);
final String val = command.substring(22);
if (!setGamePoints(activeChar, val))
{
BuilderUtil.sendSysMessage(activeChar, "Usage: //set_game_points count");
@@ -91,7 +91,7 @@ public class AdminGamePoints implements IAdminCommandHandler
{
try
{
String val = command.substring(27);
final String val = command.substring(27);
if (!subtractGamePoints(activeChar, val))
{
BuilderUtil.sendSysMessage(activeChar, "Usage: //subtract_game_points count");
@@ -114,7 +114,7 @@ public class AdminGamePoints implements IAdminCommandHandler
private boolean addGamePoints(PlayerInstance admin, String val)
{
WorldObject target = admin.getTarget();
final WorldObject target = admin.getTarget();
PlayerInstance player = null;
if (target.isPlayer())
{
@@ -150,7 +150,7 @@ public class AdminGamePoints implements IAdminCommandHandler
private boolean setGamePoints(PlayerInstance admin, String val)
{
WorldObject target = admin.getTarget();
final WorldObject target = admin.getTarget();
PlayerInstance player = null;
if (target.isPlayer())
{
@@ -176,7 +176,7 @@ public class AdminGamePoints implements IAdminCommandHandler
private boolean subtractGamePoints(PlayerInstance admin, String val)
{
WorldObject target = admin.getTarget();
final WorldObject target = admin.getTarget();
PlayerInstance player = null;
if (target.isPlayer())
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminKill.java
Vendored
+2 -2
View File
@@ -29,8 +29,8 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
import org.l2jmobius.gameserver.util.BuilderUtil;
/**
* This class handles following admin commands: - kill = kills target Creature - kill_monster = kills target non-player - kill <radius> = If radius is specified, then ALL players only in that radius will be killed. - kill_monster <radius> = If radius is specified, then ALL non-players only in
* that radius will be killed.
* This class handles following admin commands: - kill = kills target Creature - kill_monster = kills target non-player - kill <radius> = If radius is specified, then ALL players only in that radius will be killed. - kill_monster <radius> = If radius is specified, then ALL non-players only in that
* radius will be killed.
* @version $Revision: 1.2.4.5 $ $Date: 2007/07/31 10:06:06 $
*/
public class AdminKill implements IAdminCommandHandler
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminPathNode.java
Vendored
+1 -1
View File
@@ -39,7 +39,7 @@ public class AdminPathNode implements IAdminCommandHandler
{
if (activeChar.getTarget() != null)
{
List<Location> path = GeoEngine.getInstance().findPath(activeChar.getX(), activeChar.getY(), (short) activeChar.getZ(), activeChar.getTarget().getX(), activeChar.getTarget().getY(), (short) activeChar.getTarget().getZ(), activeChar.getInstanceId());
final List<Location> path = GeoEngine.getInstance().findPath(activeChar.getX(), activeChar.getY(), (short) activeChar.getZ(), activeChar.getTarget().getX(), activeChar.getTarget().getY(), (short) activeChar.getTarget().getZ(), activeChar.getInstanceId());
if (path == null)
{
BuilderUtil.sendSysMessage(activeChar, "No route found or pathfinding disabled.");
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminQuest.java
Vendored
+8 -8
View File
@@ -65,7 +65,7 @@ public class AdminQuest implements IAdminCommandHandler
{
if (command.startsWith("admin_quest_reload"))
{
StringTokenizer st = new StringTokenizer(command);
final StringTokenizer st = new StringTokenizer(command);
st.nextToken(); // skip command token
if (!st.hasMoreTokens())
@@ -74,8 +74,8 @@ public class AdminQuest implements IAdminCommandHandler
return false;
}
String script = st.nextToken();
Quest quest = findScript(script);
final String script = st.nextToken();
final Quest quest = findScript(script);
if (quest == null)
{
BuilderUtil.sendSysMessage(activeChar, "The script " + script + " couldn't be found!");
@@ -92,7 +92,7 @@ public class AdminQuest implements IAdminCommandHandler
}
else if (command.startsWith("admin_script_load"))
{
StringTokenizer st = new StringTokenizer(command);
final StringTokenizer st = new StringTokenizer(command);
st.nextToken(); // skip command token
if (!st.hasMoreTokens())
@@ -101,7 +101,7 @@ public class AdminQuest implements IAdminCommandHandler
return false;
}
String script = st.nextToken();
final String script = st.nextToken();
try
{
ScriptEngineManager.getInstance().executeScript(Paths.get(script));
@@ -115,7 +115,7 @@ public class AdminQuest implements IAdminCommandHandler
}
else if (command.startsWith("admin_script_unload"))
{
StringTokenizer st = new StringTokenizer(command);
final StringTokenizer st = new StringTokenizer(command);
st.nextToken(); // skip command token
if (!st.hasMoreTokens())
@@ -124,8 +124,8 @@ public class AdminQuest implements IAdminCommandHandler
return false;
}
String script = st.nextToken();
Quest quest = findScript(script);
final String script = st.nextToken();
final Quest quest = findScript(script);
if (quest == null)
{
BuilderUtil.sendSysMessage(activeChar, "The script " + script + " couldn't be found!");
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/FindPvP.java
Vendored
+1 -1
View File
@@ -84,7 +84,7 @@ public class FindPvP implements IBypassHandler
// Check if the player's clan is already outnumbering the PvP
if (player.getClan() != null)
{
Map<Integer, Integer> clanNumbers = new HashMap<>();
final Map<Integer, Integer> clanNumbers = new HashMap<>();
int allyId = player.getAllyId();
if (allyId == 0)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java
Vendored
+1 -1
View File
@@ -282,7 +282,7 @@ public class NpcViewMod implements IBypassHandler
{
final StringBuilder sb = new StringBuilder();
int height = 64;
final int height = 64;
final DropHolder dropItem = dropList.get(i);
final Item item = ItemTable.getInstance().getTemplate(dropItem.getItemId());
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java
Vendored
+15 -15
View File
@@ -141,35 +141,35 @@ public class DropSearchBoard implements IParseBoardHandler
public boolean parseCommunityBoardCommand(String command, PlayerInstance player)
{
final String navigation = HtmCache.getInstance().getHtm(player, NAVIGATION_PATH);
String[] params = command.split(" ");
final String[] params = command.split(" ");
String html = HtmCache.getInstance().getHtm(player, "data/html/CommunityBoard/Custom/dropsearch/main.html");
switch (params[0])
{
case "_bbs_search_item":
{
String itemName = buildItemName(params);
String result = buildItemSearchResult(itemName);
final String itemName = buildItemName(params);
final String result = buildItemSearchResult(itemName);
html = html.replace("%searchResult%", result);
break;
}
case "_bbs_search_drop":
{
final DecimalFormat chanceFormat = new DecimalFormat("0.00##");
int itemId = Integer.parseInt(params[1]);
final int itemId = Integer.parseInt(params[1]);
int page = Integer.parseInt(params[2]);
List<CBDropHolder> list = DROP_INDEX_CACHE.get(itemId);
final List<CBDropHolder> list = DROP_INDEX_CACHE.get(itemId);
int pages = list.size() / 14;
if (pages == 0)
{
pages++;
}
int start = (page - 1) * 14;
int end = Math.min(list.size() - 1, start + 14);
StringBuilder builder = new StringBuilder();
final int start = (page - 1) * 14;
final int end = Math.min(list.size() - 1, start + 14);
final StringBuilder builder = new StringBuilder();
for (int index = start; index <= end; index++)
{
CBDropHolder cbDropHolder = list.get(index);
final CBDropHolder cbDropHolder = list.get(index);
// real time server rate calculations
double rateChance = 1;
@@ -286,8 +286,8 @@ public class DropSearchBoard implements IParseBoardHandler
}
case "_bbs_npc_trace":
{
int npcId = Integer.parseInt(params[1]);
Spawn spawn = SpawnTable.getInstance().getAnySpawn(npcId);
final int npcId = Integer.parseInt(params[1]);
final Spawn spawn = SpawnTable.getInstance().getAnySpawn(npcId);
if (spawn == null)
{
player.sendMessage("Cannot find any spawn. Maybe dropped by a boss or instance monster.");
@@ -316,8 +316,8 @@ public class DropSearchBoard implements IParseBoardHandler
private String buildItemSearchResult(String itemName)
{
int limit = 0;
Set<Integer> existInDropData = DROP_INDEX_CACHE.keySet();
List<Item> items = new ArrayList<>();
final Set<Integer> existInDropData = DROP_INDEX_CACHE.keySet();
final List<Item> items = new ArrayList<>();
for (Item item : ItemTable.getInstance().getAllItems())
{
if (item == null)
@@ -349,7 +349,7 @@ public class DropSearchBoard implements IParseBoardHandler
int line = 0;
StringBuilder builder = new StringBuilder(items.size() * 28);
final StringBuilder builder = new StringBuilder(items.size() * 28);
int i = 0;
for (Item item : items)
{
@@ -402,7 +402,7 @@ public class DropSearchBoard implements IParseBoardHandler
*/
private String buildItemName(String[] params)
{
StringJoiner joiner = new StringJoiner(" ");
final StringJoiner joiner = new StringJoiner(" ");
for (int i = 1; i < params.length; i++)
{
joiner.add(params[i]);
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/communityboard/HomeBoard.java
Vendored
+2 -2
View File
@@ -99,7 +99,7 @@ public class HomeBoard implements IParseBoardHandler
@Override
public String[] getCommunityBoardCommands()
{
List<String> commands = new ArrayList<>();
final List<String> commands = new ArrayList<>();
commands.addAll(Arrays.asList(COMMANDS));
commands.addAll(Arrays.asList(CUSTOM_COMMANDS));
return commands.stream().filter(Objects::nonNull).toArray(String[]::new);
@@ -203,7 +203,7 @@ public class HomeBoard implements IParseBoardHandler
{
player.destroyItemByItemId("CB_Buff", Config.COMMUNITYBOARD_CURRENCY, Config.COMMUNITYBOARD_BUFF_PRICE * buffCount, player, true);
final Summon pet = player.getSummon();
List<Creature> targets = new ArrayList<>(4);
final List<Creature> targets = new ArrayList<>(4);
targets.add(player);
if (pet != null)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java
Vendored
+1 -1
View File
@@ -111,7 +111,7 @@ public class RestorationRandom extends AbstractEffect
continue;
}
long itemCount = (long) (item.getCount() * Config.RATE_EXTRACTABLE);
final long itemCount = (long) (item.getCount() * Config.RATE_EXTRACTABLE);
final Item template = ItemTable.getInstance().getTemplate(item.getId());
if (template.isStackable())
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/targethandlers/AuraFriendly.java
Vendored
+4 -4
View File
@@ -39,9 +39,9 @@ public class AuraFriendly implements ITargetTypeHandler
@Override
public WorldObject[] getTargetList(Skill skill, Creature creature, boolean onlyFirst, Creature target)
{
List<Creature> targetList = new ArrayList<>();
PlayerInstance player = creature.getActingPlayer();
int maxTargets = skill.getAffectLimit();
final List<Creature> targetList = new ArrayList<>();
final PlayerInstance player = creature.getActingPlayer();
final int maxTargets = skill.getAffectLimit();
World.getInstance().forEachVisibleObject(player, Creature.class, obj ->
{
if ((obj == creature) || !checkTarget(player, obj))
@@ -79,7 +79,7 @@ public class AuraFriendly implements ITargetTypeHandler
if (target.isPlayable())
{
PlayerInstance targetPlayer = target.getActingPlayer();
final PlayerInstance targetPlayer = target.getActingPlayer();
if (player.isInDuelWith(target))
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/usercommandhandlers/ClanPenalty.java
Vendored
+1 -1
View File
@@ -42,7 +42,7 @@ public class ClanPenalty implements IUserCommandHandler
}
boolean penalty = false;
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
final StringBuilder htmlContent = new StringBuilder(500);
htmlContent.append("<html><body><center><table width=270 border=0 bgcolor=111111><tr><td width=170>Penalty</td><td width=100 align=center>Expiration Date</td></tr></table><table width=270 border=0><tr>");
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java
Vendored
+1 -1
View File
@@ -142,7 +142,7 @@ public class CastleDungeon extends AbstractInstance
@Override
public String onKill(Npc npc, PlayerInstance player, boolean isSummon)
{
InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
final InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
if (world != null)
{
if (CommonUtil.contains(RAIDS3, npc.getId()))
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
Vendored
+1 -1
View File
@@ -1616,7 +1616,7 @@ public class CrystalCaverns extends AbstractInstance
{
world.setStatus(8);
// first door opener trap
Npc trap = addTrap(DOOR_OPENING_TRAP[0], DOOR_OPENING_TRAP[1], DOOR_OPENING_TRAP[2], DOOR_OPENING_TRAP[3], DOOR_OPENING_TRAP[4], world.getInstanceId());
final Npc trap = addTrap(DOOR_OPENING_TRAP[0], DOOR_OPENING_TRAP[1], DOOR_OPENING_TRAP[2], DOOR_OPENING_TRAP[3], DOOR_OPENING_TRAP[4], world.getInstanceId());
trap.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.YOU_HAVE_FINALLY_COME_HERE_BUT_YOU_WILL_NOT_BE_ABLE_TO_FIND_THE_SECRET_ROOM);
}
}
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java
Vendored
+1 -1
View File
@@ -655,7 +655,7 @@ public class DarkCloudMansion extends AbstractInstance
DMCNpc thisNpc;
int idx = 0;
int[] temp = Beleths[getRandom(Beleths.length)];
final int[] temp = Beleths[getRandom(Beleths.length)];
fifthRoom.reset = 0;
fifthRoom.founded = 0;
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/instances/SSQSanctumOfTheLordsOfDawn/SSQSanctumOfTheLordsOfDawn.java
Vendored
+1 -1
View File
@@ -110,7 +110,7 @@ public class SSQSanctumOfTheLordsOfDawn extends AbstractInstance
}
}
InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
final InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
if (world != null)
{
boolean teleported = false;
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
Vendored
+1 -1
View File
@@ -46,7 +46,7 @@ public class Q00019_GoToThePastureland extends Quest
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
String htmltext = event;
QuestState st = player.getQuestState(getName());
final QuestState st = player.getQuestState(getName());
if (st == null)
{
return htmltext;
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
Vendored
+1 -1
View File
@@ -46,7 +46,7 @@ public class Q00032_AnObviousLie extends Quest
// Misc
private static final int MIN_LVL = 45;
// Reward
private static final Map<String, Integer> EARS = new HashMap<>();
private static final Map<String, Integer> EARS = new HashMap<>();
static
{
EARS.put("cat", 6843); // Cat Ears
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
Vendored
+1 -1
View File
@@ -77,7 +77,7 @@ public class Q00101_SwordOfSolidarity extends Quest
{
final QuestState qs = getQuestState(player, false);
String htmltext = null;
if(qs != null)
if (qs != null)
{
switch (event)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
Vendored
+1 -1
View File
@@ -57,7 +57,7 @@ public class Q00152_ShardsOfGolem extends Quest
{
final QuestState qs = getQuestState(player, false);
String htmltext = null;
if(qs != null)
if (qs != null)
{
switch (event)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
Vendored
+1 -1
View File
@@ -51,7 +51,7 @@ public class Q00156_MillenniumLove extends Quest
{
final QuestState qs = getQuestState(player, false);
String htmltext = null;
if(qs != null)
if (qs != null)
{
switch (event)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
Vendored
+1 -1
View File
@@ -53,7 +53,7 @@ public class Q00157_RecoverSmuggledGoods extends Quest
{
final QuestState qs = getQuestState(player, false);
String htmltext = null;
if(qs != null)
if (qs != null)
{
switch (event)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
Vendored
+1 -1
View File
@@ -60,7 +60,7 @@ public class Q00163_LegacyOfThePoet extends Quest
{
final QuestState qs = getQuestState(player, false);
String htmltext = null;
if(qs != null)
if (qs != null)
{
switch (event)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
Vendored
+1 -1
View File
@@ -51,7 +51,7 @@ public class Q00167_DwarvenKinship extends Quest
{
final QuestState qs = getQuestState(player, false);
String htmltext = null;
if(qs != null)
if (qs != null)
{
switch (event)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
Vendored
+1 -1
View File
@@ -57,7 +57,7 @@ public class Q00169_OffspringOfNightmares extends Quest
{
final QuestState qs = getQuestState(player, false);
String htmltext = null;
if(qs != null)
if (qs != null)
{
switch (event)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
Vendored
+2 -2
View File
@@ -87,7 +87,7 @@ public class Q00241_PossessorOfAPreciousSoul1 extends Quest
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
String htmltext = event;
QuestState st = player.getQuestState(getName());
final QuestState st = player.getQuestState(getName());
if (st == null)
{
return htmltext;
@@ -232,7 +232,7 @@ public class Q00241_PossessorOfAPreciousSoul1 extends Quest
break;
}
int cond = st.getInt("cond");
final int cond = st.getInt("cond");
switch (npc.getId())
{
case TALIEN:
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
Vendored
+3 -3
View File
@@ -66,7 +66,7 @@ public class Q00246_PossessorOfAPreciousSoul3 extends Quest
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
String htmltext = event;
QuestState st = player.getQuestState(getName());
final QuestState st = player.getQuestState(getName());
if (st == null)
{
return htmltext;
@@ -159,7 +159,7 @@ public class Q00246_PossessorOfAPreciousSoul3 extends Quest
break;
}
int cond = st.getInt("cond");
final int cond = st.getInt("cond");
switch (npc.getId())
{
case CARADINE:
@@ -269,7 +269,7 @@ public class Q00246_PossessorOfAPreciousSoul3 extends Quest
return null;
}
QuestState st = player.getQuestState(getName());
final QuestState st = player.getQuestState(getName());
if ((st != null) && !st.isCond(2))
{
return null;
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
Vendored
+1 -1
View File
@@ -126,7 +126,7 @@ public class Q00259_RequestFromTheFarmOwner extends Quest
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
final QuestState qs = getQuestState(killer, false);
if(qs != null)
if (qs != null)
{
giveItems(killer, SPIDER_SKIN, 1);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
Vendored
+1 -1
View File
@@ -55,7 +55,7 @@ public class Q00267_WrathOfVerdure extends Quest
{
final QuestState qs = getQuestState(player, false);
String htmltext = null;
if(qs != null)
if (qs != null)
{
switch (event)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java
Vendored
+1 -1
View File
@@ -107,7 +107,7 @@ public class Q00269_InventionAmbition extends Quest
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if(qs != null)
if (qs != null)
{
giveItemRandomly(qs.getPlayer(), npc, ENERGY_ORE, 1, 0, MONSTERS.get(npc.getId()), true);
}
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
Vendored
+2 -2
View File
@@ -65,7 +65,7 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
{
final QuestState qs = getQuestState(player, false);
String htmltext = null;
if(qs != null)
if (qs != null)
{
switch (event)
{
@@ -95,7 +95,7 @@ public class Q00273_InvadersOfTheHolyLand extends Quest
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
final QuestState qs = getQuestState(killer, false);
if(qs != null)
if (qs != null)
{
if (getRandom(100) <= MONSTERS.get(npc.getId()))
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
Vendored
+1 -1
View File
@@ -103,7 +103,7 @@ public class Q00283_TheFewTheProudTheBrave extends Quest
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if(qs != null)
if (qs != null)
{
giveItemRandomly(killer, npc, CRIMSON_SPIDER_CLAW, 1, 0, 0.6, true);
}
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
Vendored
+1 -1
View File
@@ -109,7 +109,7 @@ public class Q00293_TheHiddenVeins extends Quest
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
final QuestState qs = getQuestState(killer, false);
if(qs != null)
if (qs != null)
{
final int chance = getRandom(100);
if (chance > 50)
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
Vendored
+1 -1
View File
@@ -72,7 +72,7 @@ public class Q00326_VanquishRemnants extends Quest
{
final QuestState qs = getQuestState(player, false);
String htmltext = null;
if(qs != null)
if (qs != null)
{
switch (event)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
Vendored
+1 -1
View File
@@ -345,7 +345,7 @@ public class Q00327_RecoverTheFarmland extends Quest
public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
{
final QuestState qs = getQuestState(killer, false);
if(qs != null)
if (qs != null)
{
if ((npc.getId() == TUREK_ORK_SHAMAN) || (npc.getId() == TUREK_ORK_WARLORD))
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
Vendored
+1 -1
View File
@@ -74,7 +74,7 @@ public class Q00328_SenseForBusiness extends Quest
{
final QuestState qs = getQuestState(player, false);
String htmltext = null;
if(qs != null)
if (qs != null)
{
switch (event)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
Vendored
+1 -1
View File
@@ -105,7 +105,7 @@ public class Q00338_AlligatorHunter extends Quest
public String onKill(Npc npc, PlayerInstance player, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if(qs != null)
if (qs != null)
{
giveItems(player, ALLIGATOR_LEATHER, 1);
if (getRandom(100) < SECOND_CHANCE)
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00344_1000YearsTheEndOfLamentation/Q00344_1000YearsTheEndOfLamentation.java
Vendored
+1 -1
View File
@@ -44,7 +44,7 @@ public class Q00344_1000YearsTheEndOfLamentation extends Quest
private static final ItemHolder TOTEM_NECKLACE = new ItemHolder(4272, 1);
private static final ItemHolder CRUCIFIX = new ItemHolder(4273, 1);
// Monsters
private static final Map<Integer, Double> MONSTER_CHANCES = new HashMap<>();
private static final Map<Integer, Double> MONSTER_CHANCES = new HashMap<>();
static
{
MONSTER_CHANCES.put(20236, 0.58); // Cave Servant
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java
Vendored
+6 -6
View File
@@ -166,7 +166,7 @@ public class Q00348_AnArrogantSearch extends Quest
}
case "30864-08.html":
{
int memoState = qs.getMemoState();
final int memoState = qs.getMemoState();
if (((memoState == 1) && hasAtLeastOneQuestItem(player, TITANS_POWERSTONE, SHELL_OF_MONSTERS)) || (memoState == 2))
{
qs.setMemoStateEx(0, 4);
@@ -565,7 +565,7 @@ public class Q00348_AnArrogantSearch extends Quest
{
if ((qs.getMemoStateEx(0) == 17) && hasQuestItems(qs.getPlayer(), WHITE_FABRIC_1))
{
int i0 = qs.getMemoStateEx(1) + getRandom(100) + 100;
final int i0 = qs.getMemoStateEx(1) + getRandom(100) + 100;
qs.setMemoStateEx(1, i0);
if ((qs.getMemoStateEx(1) + i0) > 750)
{
@@ -630,7 +630,7 @@ public class Q00348_AnArrogantSearch extends Quest
case 1:
case 2:
{
int memoState = qs.getMemoState();
final int memoState = qs.getMemoState();
if ((memoState == 1) && !hasQuestItems(player, TITANS_POWERSTONE) && !hasQuestItems(player, SHELL_OF_MONSTERS))
{
htmltext = "30864-06.html";
@@ -1239,7 +1239,7 @@ public class Q00348_AnArrogantSearch extends Quest
{
if (hasQuestItems(player, HANELLINS_2ND_LETTER))
{
int i0 = qs.getMemoStateEx(1) + 100;
final int i0 = qs.getMemoStateEx(1) + 100;
if ((i0 % 10) == 0)
{
addRadar(player, 181472, 7158, -2725);
@@ -1282,7 +1282,7 @@ public class Q00348_AnArrogantSearch extends Quest
{
if (hasQuestItems(player, HANELLINS_1ST_LETTER))
{
int i0 = qs.getMemoStateEx(1) + 10;
final int i0 = qs.getMemoStateEx(1) + 10;
if ((i0 % 10) == 0)
{
addRadar(player, 2908, 44128, -2712);
@@ -1325,7 +1325,7 @@ public class Q00348_AnArrogantSearch extends Quest
{
if (hasQuestItems(player, HANELLINS_3RD_LETTER))
{
int i0 = qs.getMemoStateEx(1) + 1000;
final int i0 = qs.getMemoStateEx(1) + 1000;
if ((i0 % 10) == 0)
{
addRadar(player, 50693, 158674, 376);
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
Vendored
+1 -1
View File
@@ -136,7 +136,7 @@ public class Q00354_ConquestOfAlligatorIsland extends Quest
public String onKill(Npc npc, PlayerInstance player, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(player, -1, 3, npc);
if(qs != null)
if (qs != null)
{
final int npcId = npc.getId();
if (MOB1.containsKey(npcId))
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
Vendored
+1 -1
View File
@@ -108,7 +108,7 @@ public class Q00368_TrespassingIntoTheHolyGround extends Quest
}
final QuestState qs = getRandomPartyMemberState(player, -1, i, npc);
if(qs != null)
if (qs != null)
{
giveItemRandomly(player, npc, BLADE_STAKATO_FANG, 1, 0, MOBS.get(npc.getId()), true);
}
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00370_AnElderSowsSeeds/Q00370_AnElderSowsSeeds.java
Vendored
+1 -1
View File
@@ -143,7 +143,7 @@ public class Q00370_AnElderSowsSeeds extends Quest
else
{
final QuestState qs = getRandomPartyMemberState(player, -1, 3, npc);
if(qs != null)
if (qs != null)
{
giveItemRandomly(qs.getPlayer(), npc, SPELLBOOK_PAGE, 1, 0, MOBS2.get(npcId), true);
}
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
Vendored
+1 -1
View File
@@ -40,7 +40,7 @@ public class Q00380_BringOutTheFlavorOfIngredients extends Quest
private static final int MOON_FLOWER = 5896;
private static final int LEECH_FLUIDS = 5897;
// Monsters
private static final Map<Integer, ItemChanceHolder> MONSTER_CHANCES = new HashMap<>();
private static final Map<Integer, ItemChanceHolder> MONSTER_CHANCES = new HashMap<>();
static
{
MONSTER_CHANCES.put(20205, new ItemChanceHolder(RITRON_FRUIT, 0.1, 4)); // Dire Wolf
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
Vendored
+15 -15
View File
@@ -101,7 +101,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
public String onTalk(Npc npc, PlayerInstance player)
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
final String htmltext = getNoQuestMsg(player);
switch (npc.getId())
{
@@ -387,7 +387,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
{
for (int i0 = 0; i0 < 9; i0 += 1)
{
int i1 = getNumberFromBingoBoard(qs, i0);
final int i1 = getNumberFromBingoBoard(qs, i0);
if (isSelectedBingoNumber(qs, i1))
{
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
@@ -404,7 +404,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
{
for (int i0 = 0; i0 < 9; i0 += 1)
{
int i1 = getNumberFromBingoBoard(qs, i0);
final int i1 = getNumberFromBingoBoard(qs, i0);
html = html.replace("<?FontColor" + (i0 + 1) + "?>", (isSelectedBingoNumber(qs, i1)) ? "ff0000" : "ffffff");
html = html.replace("<?Cell" + (i0 + 1) + "?>", Integer.toString(i1));
}
@@ -416,7 +416,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
if (!isSelectedBingoNumber(qs, num))
{
selectBingoNumber(qs, num);
int i3 = getMatchedBingoLineCount(qs);
final int i3 = getMatchedBingoLineCount(qs);
String html;
if ((i3 == 3) && ((getBingoSelectCount(qs)) == 6))
{
@@ -443,7 +443,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
{
if (qs.getMemoState() == 10)
{
int random = getRandom(100);
final int random = getRandom(100);
if (random < 16)
{
giveItems(player, SYNTHESIS_COKES, 1);
@@ -476,7 +476,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
}
else if (qs.getMemoState() == 20)
{
int random = getRandom(100);
final int random = getRandom(100);
if (random < 50)
{
@@ -500,7 +500,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
{
if (qs.getMemoState() == 10)
{
int random = getRandom(100);
final int random = getRandom(100);
if (random < 50)
{
@@ -521,7 +521,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
}
else if (qs.getMemoState() == 20)
{
int random = getRandom(100);
final int random = getRandom(100);
if (random < 50)
{
@@ -550,7 +550,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
private void createBingoBoard(QuestState qs)
{
//@formatter:off
Integer[] arr = {1,2,3,4,5,6,7,8,9};
final Integer[] arr = {1,2,3,4,5,6,7,8,9};
//@formatter:on
Collections.shuffle(Arrays.asList(arr));
qs.set("numbers", Arrays.asList(arr).toString().replaceAll("[^\\d ]", ""));
@@ -563,7 +563,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
*/
private int getMatchedBingoLineCount(QuestState qs)
{
String[] q = qs.get("selected").split(" ");
final String[] q = qs.get("selected").split(" ");
int found = 0;
// Horizontal
if ((q[0] + q[1] + q[2]).matches("\\d+"))
@@ -609,7 +609,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
*/
private void selectBingoNumber(QuestState qs, int num)
{
String[] numbers = qs.get("numbers").split(" ");
final String[] numbers = qs.get("numbers").split(" ");
int pos = 0;
for (int i = 0; i < numbers.length; i++)
{
@@ -619,7 +619,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
break;
}
}
String[] selected = qs.get("selected").split(" ");
final String[] selected = qs.get("selected").split(" ");
for (int i = 0; i < selected.length; i++)
{
if (i == pos)
@@ -661,7 +661,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
*/
private int getBingoSelectCount(QuestState qs)
{
String current = qs.get("selected");
final String current = qs.get("selected");
return current.replaceAll("\\D", "").length();
}
@@ -889,7 +889,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
private QuestState getRandomPlayerFromParty(PlayerInstance player, Npc npc)
{
QuestState qs = getQuestState(player, false);
final QuestState qs = getQuestState(player, false);
final List<QuestState> candidates = new ArrayList<>();
if ((qs != null) && qs.isStarted())
@@ -903,7 +903,7 @@ public class Q00384_WarehouseKeepersPastime extends Quest
player.getParty().getMembers().stream().forEach(pm ->
{
QuestState qss = getQuestState(pm, false);
final QuestState qss = getQuestState(pm, false);
if ((qss != null) && qss.isStarted() && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, pm, true))
{
candidates.add(qss);
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00385_YokeOfThePast/Q00385_YokeOfThePast.java
Vendored
+1 -1
View File
@@ -46,7 +46,7 @@ public class Q00385_YokeOfThePast extends Quest
// Reward
private static final int BLANK_SCROLL = 5965;
// Monsters
private static final Map<Integer, Double> MONSTER_CHANCES = new HashMap<>();
private static final Map<Integer, Double> MONSTER_CHANCES = new HashMap<>();
static
{
MONSTER_CHANCES.put(21144, 0.306); // Catacomb Shadow
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
Vendored
+1 -1
View File
@@ -414,7 +414,7 @@ public class Q00511_AwlUnderFoot extends Quest
{
return ret;
}
else if(qs != null)
else if (qs != null)
{
final int npcId = npc.getId();
int cond = 0;
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00512_BladeUnderFoot/Q00512_BladeUnderFoot.java
Vendored
+2 -2
View File
@@ -100,7 +100,7 @@ public class Q00512_BladeUnderFoot extends Quest
final QuestState qs = getQuestState(player, false);
if ((qs != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
int playerCount = player.getParty().getMemberCount();
final int playerCount = player.getParty().getMemberCount();
int itemCount = RAID_BOSSES.get(npc.getId()).getSecondChance();
if (playerCount > 0)
@@ -164,7 +164,7 @@ public class Q00512_BladeUnderFoot extends Quest
public String onKill(Npc npc, PlayerInstance player, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if(qs != null)
if (qs != null)
{
if (player.getParty() != null)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
Vendored
+1 -1
View File
@@ -268,7 +268,7 @@ public class Q00619_RelicsOfTheOldEmpire extends Quest
public String onKill(Npc npc, PlayerInstance player, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(player, -1, 3, npc);
if(qs != null)
if (qs != null)
{
final int npcId = npc.getId();
if (CommonUtil.contains(ARCHON_OF_HALISHA, npcId))
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java
Vendored
+9 -9
View File
@@ -457,7 +457,7 @@ public class Q00620_FourGoblets extends Quest
final QuestState qs = getRandomPartyMemberState(player, -1, 3, npc);
if (qs != null)
{
int npcId = npc.getId();
final int npcId = npc.getId();
if (MOB1.containsKey(npcId))
{
giveItemRandomly(qs.getPlayer(), npc, SEALED_BOX, 1, 0, MOB1.get(npcId), true);
@@ -631,7 +631,7 @@ public class Q00620_FourGoblets extends Quest
if (getRandom(1000) < 848)
{
i2 = true;
int i1 = getRandom(1000);
final int i1 = getRandom(1000);
if (i1 < 43)
{
giveItems(player, CORD);
@@ -677,7 +677,7 @@ public class Q00620_FourGoblets extends Quest
if (getRandom(1000) < 323)
{
i2 = true;
int i1 = getRandom(1000);
final int i1 = getRandom(1000);
if (i1 < 335)
{
giveItems(player, SYNTETHIC_COKES);
@@ -714,7 +714,7 @@ public class Q00620_FourGoblets extends Quest
if (getRandom(1000) < 847)
{
i2 = true;
int i1 = getRandom(1000);
final int i1 = getRandom(1000);
if (i1 < 148)
{
giveItems(player, BRAIDED_HEMP);
@@ -760,7 +760,7 @@ public class Q00620_FourGoblets extends Quest
if (getRandom(1000) < 251)
{
i2 = true;
int i1 = getRandom(1000);
final int i1 = getRandom(1000);
if (i1 < 350)
{
giveItems(player, VARNISH_OF_PURITY);
@@ -797,7 +797,7 @@ public class Q00620_FourGoblets extends Quest
if (getRandom(1000) < 31)
{
i2 = true;
int i1 = getRandom(1000);
final int i1 = getRandom(1000);
if (i1 < 223)
{
giveItems(player, ENCHANT_ARMOR_A_GRADE);
@@ -815,7 +815,7 @@ public class Q00620_FourGoblets extends Quest
if (getRandom(1000) < 5)
{
i2 = true;
int i1 = getRandom(1000);
final int i1 = getRandom(1000);
if (i1 < 202)
{
giveItems(player, ENCHANT_WEAPON_A_GRADE);
@@ -836,7 +836,7 @@ public class Q00620_FourGoblets extends Quest
if (getRandom(1000) < 329)
{
i2 = true;
int i1 = getRandom(1000);
final int i1 = getRandom(1000);
if (i1 < 88)
{
giveItems(player, SEALED_TATEOSSIAN_EARRING_PART);
@@ -910,7 +910,7 @@ public class Q00620_FourGoblets extends Quest
if (getRandom(1000) < 54)
{
i2 = true;
int i1 = getRandom(1000);
final int i1 = getRandom(1000);
if (i1 < 100)
{
giveItems(player, FORGOTTEN_BLADE_EDGE);
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
Vendored
+1 -1
View File
@@ -67,7 +67,7 @@ public class Q00624_TheFinestIngredientsPart1 extends Quest
{
final QuestState qs = getQuestState(player, false);
String htmltext = null;
if(qs != null)
if (qs != null)
{
switch (event)
{
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
Vendored
+4 -4
View File
@@ -113,7 +113,7 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
String htmltext = event;
QuestState st = player.getQuestState(getName());
final QuestState st = player.getQuestState(getName());
if (st == null)
{
return htmltext;
@@ -140,7 +140,7 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
htmltext = "31537-06.htm";
takeItems(player, TOP_QUALITY_MEAT, -1);
int[] reward = REWARDS[Integer.parseInt(event)];
final int[] reward = REWARDS[Integer.parseInt(event)];
rewardItems(player, reward[0], reward[1]);
playSound(player, QuestSound.ITEMSOUND_QUEST_FINISH);
@@ -195,13 +195,13 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
@Override
public String onKill(Npc npc, PlayerInstance player, boolean isPet)
{
PlayerInstance partyMember = getRandomPartyMember(player, 1);
final PlayerInstance partyMember = getRandomPartyMember(player, 1);
if (partyMember == null)
{
return null;
}
QuestState st = partyMember.getQuestState(getName());
final QuestState st = partyMember.getQuestState(getName());
if (st == null)
{
return null;
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
Vendored
+4 -4
View File
@@ -50,8 +50,8 @@ public class Q00647_InfluxOfMachines extends Quest
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
String htmltext = event;
QuestState st = player.getQuestState(getName());
final String htmltext = event;
final QuestState st = player.getQuestState(getName());
if (st == null)
{
return htmltext;
@@ -105,13 +105,13 @@ public class Q00647_InfluxOfMachines extends Quest
@Override
public String onKill(Npc npc, PlayerInstance player, boolean isPet)
{
PlayerInstance partyMember = getRandomPartyMember(player, 1);
final PlayerInstance partyMember = getRandomPartyMember(player, 1);
if (partyMember == null)
{
return null;
}
QuestState st = partyMember.getQuestState(getName());
final QuestState st = partyMember.getQuestState(getName());
if (st == null)
{
return null;
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
Vendored
+1 -1
View File
@@ -109,7 +109,7 @@ public class Q00659_IdRatherBeCollectingFairyBreath extends Quest
public String onKill(Npc npc, PlayerInstance player, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(player, -1, 3, npc);
if(qs != null)
if (qs != null)
{
giveItemRandomly(player, npc, FAIRY_BREATH, 1, 0, MOBS.get(npc.getId()), true);
}
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
Vendored
+18 -18
View File
@@ -345,14 +345,14 @@ public class Q00663_SeductiveWhispers extends Quest
if (qs.isStarted() && ((qs.getMemoState() % 10) == 6) && ((qs.getMemoState() / 1000) == 0))
{
final int card1pic = Math.max(qs.getMemoStateEx(1), 0);
int i1 = card1pic % 10;
int i2 = (card1pic - i1) / 10;
int rnd1 = getRandom(2) + 1;
int rnd2 = getRandom(5) + 1;
int card2pic = (rnd1 * 10) + rnd2;
final int i1 = card1pic % 10;
final int i2 = (card1pic - i1) / 10;
final int rnd1 = getRandom(2) + 1;
final int rnd2 = getRandom(5) + 1;
final int card2pic = (rnd1 * 10) + rnd2;
if (rnd1 == i2)
{
int i3 = rnd2 + i1;
final int i3 = rnd2 + i1;
if (((i3 % 5) == 0) && (i3 != 10))
{
qs.setMemoState(1);
@@ -397,7 +397,7 @@ public class Q00663_SeductiveWhispers extends Quest
{
if (qs.isStarted() && ((qs.getMemoState() % 10) == 7) && ((qs.getMemoState() / 1000) == 0))
{
int i0 = qs.getMemoState() / 10;
final int i0 = qs.getMemoState() / 10;
if (i0 == 0)
{
giveAdena(player, 40000, true);
@@ -616,14 +616,14 @@ public class Q00663_SeductiveWhispers extends Quest
{
card1pic = 0;
}
int card1 = card1pic % 10;
int i2 = (card1pic - card1) / 10;
int rnd1 = getRandom(2) + 1;
int rnd2 = getRandom(5) + 1;
int card2pic = (rnd1 * 10) + rnd2;
final int card1 = card1pic % 10;
final int i2 = (card1pic - card1) / 10;
final int rnd1 = getRandom(2) + 1;
final int rnd2 = getRandom(5) + 1;
final int card2pic = (rnd1 * 10) + rnd2;
if (rnd1 == i2)
{
int i3 = rnd2 + card1;
final int i3 = rnd2 + card1;
if (((i3 % 5) == 0) && (i3 != 10))
{
qs.setMemoState(1);
@@ -662,11 +662,11 @@ public class Q00663_SeductiveWhispers extends Quest
if (qs.isStarted() && qs.isMemoState(1006))
{
final int card1pic = Math.max(qs.getMemoStateEx(1), 0);
int i1 = card1pic % 10;
int i2 = (card1pic - i1) / 10;
int rnd1 = getRandom(2) + 1;
int rnd2 = getRandom(5) + 1;
int card2pic = (rnd1 * 10) + rnd2;
final int i1 = card1pic % 10;
final int i2 = (card1pic - i1) / 10;
final int rnd1 = getRandom(2) + 1;
final int rnd2 = getRandom(5) + 1;
final int card2pic = (rnd1 * 10) + rnd2;
if (rnd1 == i2)
{
final int i3 = rnd2 + i1;
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
Vendored
+1 -1
View File
@@ -108,7 +108,7 @@ public class TerritoryWarSuperClass extends Quest
private void handleKillTheQuest(PlayerInstance player)
{
QuestState qs = getQuestState(player, true);
final QuestState qs = getQuestState(player, true);
int kill = 1;
int max = 10;
if (!qs.isCompleted())
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java
+9 -9
View File
@@ -3296,11 +3296,11 @@ public class Config
NETWORK_SERVER_LINK = VoteReward.getString("NetworkServerLink", "");
NETWORK_VOTES_DIFFERENCE = VoteReward.getInt("NetworkVotesDifference", 5);
NETWORK_REWARD_CHECK_TIME = VoteReward.getInt("NetworkRewardCheckTime", 5);
String NETWORK_SMALL_REWARD_VALUE = VoteReward.getString("NetworkReward", "57,100000000;");
String[] NETWORK_small_reward_splitted_1 = NETWORK_SMALL_REWARD_VALUE.split(";");
final String NETWORK_SMALL_REWARD_VALUE = VoteReward.getString("NetworkReward", "57,100000000;");
final String[] NETWORK_small_reward_splitted_1 = NETWORK_SMALL_REWARD_VALUE.split(";");
for (String i : NETWORK_small_reward_splitted_1)
{
String[] NETWORK_small_reward_splitted_2 = i.split(",");
final String[] NETWORK_small_reward_splitted_2 = i.split(",");
NETWORK_REWARD.put(Integer.parseInt(NETWORK_small_reward_splitted_2[0]), Integer.parseInt(NETWORK_small_reward_splitted_2[1]));
}
NETWORK_DUALBOXES_ALLOWED = VoteReward.getInt("NetworkDualboxesAllowed", 1);
@@ -3309,11 +3309,11 @@ public class Config
TOPZONE_SERVER_LINK = VoteReward.getString("TopzoneServerLink", "");
TOPZONE_VOTES_DIFFERENCE = VoteReward.getInt("TopzoneVotesDifference", 5);
TOPZONE_REWARD_CHECK_TIME = VoteReward.getInt("TopzoneRewardCheckTime", 5);
String TOPZONE_SMALL_REWARD_VALUE = VoteReward.getString("TopzoneReward", "57,100000000;");
String[] topzone_small_reward_splitted_1 = TOPZONE_SMALL_REWARD_VALUE.split(";");
final String TOPZONE_SMALL_REWARD_VALUE = VoteReward.getString("TopzoneReward", "57,100000000;");
final String[] topzone_small_reward_splitted_1 = TOPZONE_SMALL_REWARD_VALUE.split(";");
for (String i : topzone_small_reward_splitted_1)
{
String[] topzone_small_reward_splitted_2 = i.split(",");
final String[] topzone_small_reward_splitted_2 = i.split(",");
TOPZONE_REWARD.put(Integer.parseInt(topzone_small_reward_splitted_2[0]), Integer.parseInt(topzone_small_reward_splitted_2[1]));
}
TOPZONE_DUALBOXES_ALLOWED = VoteReward.getInt("TopzoneDualboxesAllowed", 1);
@@ -3322,11 +3322,11 @@ public class Config
HOPZONE_SERVER_LINK = VoteReward.getString("HopzoneServerLink", "");
HOPZONE_VOTES_DIFFERENCE = VoteReward.getInt("HopzoneVotesDifference", 5);
HOPZONE_REWARD_CHECK_TIME = VoteReward.getInt("HopzoneRewardCheckTime", 5);
String HOPZONE_SMALL_REWARD_VALUE = VoteReward.getString("HopzoneReward", "57,100000000;");
String[] hopzone_small_reward_splitted_1 = HOPZONE_SMALL_REWARD_VALUE.split(";");
final String HOPZONE_SMALL_REWARD_VALUE = VoteReward.getString("HopzoneReward", "57,100000000;");
final String[] hopzone_small_reward_splitted_1 = HOPZONE_SMALL_REWARD_VALUE.split(";");
for (String i : hopzone_small_reward_splitted_1)
{
String[] hopzone_small_reward_splitted_2 = i.split(",");
final String[] hopzone_small_reward_splitted_2 = i.split(",");
HOPZONE_REWARD.put(Integer.parseInt(hopzone_small_reward_splitted_2[0]), Integer.parseInt(hopzone_small_reward_splitted_2[1]));
}
HOPZONE_DUALBOXES_ALLOWED = VoteReward.getInt("HopzoneDualboxesAllowed", 1);
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/LimitLinesDocumentListener.java
+8 -8
View File
@@ -71,7 +71,7 @@ public class LimitLinesDocumentListener implements DocumentListener
{
if (maximumLines < 1)
{
String message = "Maximum lines must be greater than 0";
final String message = "Maximum lines must be greater than 0";
throw new IllegalArgumentException(message);
}
@@ -106,8 +106,8 @@ public class LimitLinesDocumentListener implements DocumentListener
private void removeLines(DocumentEvent e)
{
// The root Element of the Document will tell us the total number of line in the Document.
Document document = e.getDocument();
Element root = document.getDefaultRootElement();
final Document document = e.getDocument();
final Element root = document.getDefaultRootElement();
while (root.getElementCount() > _maximumLines)
{
@@ -127,8 +127,8 @@ public class LimitLinesDocumentListener implements DocumentListener
*/
private void removeFromStart(Document document, Element root)
{
Element line = root.getElement(0);
int end = line.getEndOffset();
final Element line = root.getElement(0);
final int end = line.getEndOffset();
try
{
@@ -147,9 +147,9 @@ public class LimitLinesDocumentListener implements DocumentListener
{
// We use start minus 1 to make sure we remove the newline character of the previous line.
Element line = root.getElement(root.getElementCount() - 1);
int start = line.getStartOffset();
int end = line.getEndOffset();
final Element line = root.getElement(root.getElementCount() - 1);
final int start = line.getStartOffset();
final int end = line.getEndOffset();
try
{
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/commons/util/SplashScreen.java
+1 -1
View File
@@ -44,7 +44,7 @@ public class SplashScreen extends JWindow
{
setBackground(new Color(0, 255, 0, 0)); // Transparency.
image = Toolkit.getDefaultToolkit().getImage(path);
ImageIcon imageIcon = new ImageIcon(image);
final ImageIcon imageIcon = new ImageIcon(image);
setSize(imageIcon.getIconWidth(), imageIcon.getIconHeight());
setLocationRelativeTo(null);
setAlwaysOnTop(true);
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java
+14 -14
View File
@@ -818,7 +818,7 @@ public class AttackableAI extends CreatureAI
// Handle all WorldObject of its Faction inside the Faction Range
Set<Integer> clans = getActiveChar().getTemplate().getClans();
final Set<Integer> clans = getActiveChar().getTemplate().getClans();
if ((clans != null) && !clans.isEmpty())
{
final int factionRange = npc.getTemplate().getClanHelpRange() + collision;
@@ -839,8 +839,8 @@ public class AttackableAI extends CreatureAI
{
if (originalAttackTarget.isInParty() && originalAttackTarget.getParty().isInDimensionalRift())
{
byte riftType = originalAttackTarget.getParty().getDimensionalRift().getType();
byte riftRoom = originalAttackTarget.getParty().getDimensionalRift().getCurrentRoom();
final byte riftType = originalAttackTarget.getParty().getDimensionalRift().getType();
final byte riftRoom = originalAttackTarget.getParty().getDimensionalRift().getCurrentRoom();
if ((npc instanceof RiftInvaderInstance) && !DimensionalRiftManager.getInstance().getRoom(riftType, riftRoom).checkIfInZone(npc.getX(), npc.getY(), npc.getZ()))
{
@@ -911,12 +911,12 @@ public class AttackableAI extends CreatureAI
if (!npc.isMovementDisabled() && (npc.getDodge() > 0) && (Rnd.get(100) <= npc.getDodge()))
{
// Micht: Keeping this one otherwise we should do 2 sqrt
double distance2 = npc.calculateDistanceSq2D(mostHate);
final double distance2 = npc.calculateDistanceSq2D(mostHate);
if (Math.sqrt(distance2) <= (60 + combinedCollision))
{
int posX = npc.getX();
int posY = npc.getY();
int posZ = npc.getZ() + 30;
final int posZ = npc.getZ() + 30;
if (originalAttackTarget.getX() < posX)
{
@@ -973,7 +973,7 @@ public class AttackableAI extends CreatureAI
{
if (_chaosTime > Config.GRAND_CHAOS_TIME)
{
double chaosRate = 100 - ((npc.getCurrentHp() * 300) / npc.getMaxHp());
final double chaosRate = 100 - ((npc.getCurrentHp() * 300) / npc.getMaxHp());
if (((chaosRate <= 10) && (Rnd.get(100) <= 10)) || ((chaosRate > 10) && (Rnd.get(100) <= chaosRate)))
{
aggroReconsider();
@@ -1107,7 +1107,7 @@ public class AttackableAI extends CreatureAI
{
if (npc.isMinion())
{
Creature leader = npc.getLeader();
final Creature leader = npc.getLeader();
if ((leader != null) && leader.isDead())
{
for (Skill sk : aiResSkills)
@@ -1350,7 +1350,7 @@ public class AttackableAI extends CreatureAI
}
else if (sk.getTargetType() == TargetType.ONE)
{
Creature target = effectTargetReconsider(sk, false);
final Creature target = effectTargetReconsider(sk, false);
if (target != null)
{
clientStopMoving(null);
@@ -1483,7 +1483,7 @@ public class AttackableAI extends CreatureAI
return true;
}
Creature target = skillTargetReconsider(sk);
final Creature target = skillTargetReconsider(sk);
if (target != null)
{
clientStopMoving(null);
@@ -1512,7 +1512,7 @@ public class AttackableAI extends CreatureAI
return true;
}
Creature target = effectTargetReconsider(sk, false);
final Creature target = effectTargetReconsider(sk, false);
if (target != null)
{
clientStopMoving(null);
@@ -1565,7 +1565,7 @@ public class AttackableAI extends CreatureAI
}
else if (sk.getTargetType() == TargetType.ONE)
{
Creature target = effectTargetReconsider(sk, false);
final Creature target = effectTargetReconsider(sk, false);
if (target != null)
{
clientStopMoving(null);
@@ -1603,7 +1603,7 @@ public class AttackableAI extends CreatureAI
}
else if (sk.getTargetType() == TargetType.ONE)
{
Creature target = effectTargetReconsider(sk, false);
final Creature target = effectTargetReconsider(sk, false);
if (target != null)
{
clientStopMoving(null);
@@ -1619,7 +1619,7 @@ public class AttackableAI extends CreatureAI
{
if (caster.isMinion() && (sk.getTargetType() != TargetType.SELF))
{
Creature leader = caster.getLeader();
final Creature leader = caster.getLeader();
if (leader != null)
{
if (leader.isDead() && !Util.checkIfInRange((sk.getCastRange() + caster.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius()), caster, leader, false) && !isParty(sk) && !caster.isMovementDisabled())
@@ -1684,7 +1684,7 @@ public class AttackableAI extends CreatureAI
return true;
}
Creature target = skillTargetReconsider(sk);
final Creature target = skillTargetReconsider(sk);
if (target != null)
{
clientStopMoving(null);
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java
+1 -1
View File
@@ -175,7 +175,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
// Check if actor is not dead
if (!_actor.isAlikeDead())
{
Attackable npc = (Attackable) _actor;
final Attackable npc = (Attackable) _actor;
// If its _knownPlayer isn't empty set the Intention to AI_INTENTION_ACTIVE
if (!World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty())
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java
+1 -1
View File
@@ -168,7 +168,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
// Check if actor is not dead
if (!_actor.isAlikeDead())
{
Attackable npc = (Attackable) _actor;
final Attackable npc = (Attackable) _actor;
// If its _knownPlayer isn't empty set the Intention to AI_INTENTION_ACTIVE
if (!World.getInstance().getVisibleObjects(npc, PlayerInstance.class).isEmpty())
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/cache/HtmCache.java
Vendored
+1 -1
View File
@@ -120,7 +120,7 @@ public class HtmCache
BufferedInputStream bis = new BufferedInputStream(fis))
{
final int bytes = bis.available();
byte[] raw = new byte[bytes];
final byte[] raw = new byte[bytes];
bis.read(raw);
content = new String(raw, StandardCharsets.UTF_8);
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java
+8 -8
View File
@@ -60,8 +60,8 @@ public class SchemeBufferTable
try (Connection con = DatabaseFactory.getConnection())
{
PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
ResultSet rs = st.executeQuery();
final PreparedStatement st = con.prepareStatement(LOAD_SCHEMES);
final ResultSet rs = st.executeQuery();
while (rs.next())
{
@@ -70,7 +70,7 @@ public class SchemeBufferTable
final String schemeName = rs.getString("scheme_name");
final String[] skills = rs.getString("skills").split(",");
ArrayList<Integer> schemeList = new ArrayList<>();
final ArrayList<Integer> schemeList = new ArrayList<>();
for (String skill : skills)
{
@@ -97,9 +97,9 @@ public class SchemeBufferTable
try
{
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
Document doc = db.parse(new File("./data/SchemeBufferSkills.xml"));
final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
final DocumentBuilder db = dbf.newDocumentBuilder();
final Document doc = db.parse(new File("./data/SchemeBufferSkills.xml"));
final Node n = doc.getFirstChild();
@@ -246,7 +246,7 @@ public class SchemeBufferTable
*/
public List<Integer> getSkillsIdsByType(String groupType)
{
List<Integer> skills = new ArrayList<>();
final List<Integer> skills = new ArrayList<>();
for (BuffSkillHolder skill : _availableBuffs.values())
{
if (skill.getType().equalsIgnoreCase(groupType))
@@ -262,7 +262,7 @@ public class SchemeBufferTable
*/
public List<String> getSkillTypes()
{
List<String> skillTypes = new ArrayList<>();
final List<String> skillTypes = new ArrayList<>();
for (BuffSkillHolder skill : _availableBuffs.values())
{
if (!skillTypes.contains(skill.getType()))
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/GeoEngine.java
+4 -4
View File
@@ -132,7 +132,7 @@ public class GeoEngine
FileChannel fc = raf.getChannel())
{
// initialize file buffer
MappedByteBuffer buffer = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size()).load();
final MappedByteBuffer buffer = fc.map(FileChannel.MapMode.READ_ONLY, 0, fc.size()).load();
buffer.order(ByteOrder.LITTLE_ENDIAN);
// get block indexes
@@ -553,7 +553,7 @@ public class GeoEngine
dirt = 0;
// calculate next point coordinates
int e2 = 2 * d;
final int e2 = 2 * d;
if ((e2 > -dy) && (e2 < dx))
{
// calculate next point XY coordinates
@@ -703,7 +703,7 @@ public class GeoEngine
}
// perform geodata check
GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instanceId);
final GeoLocation loc = checkMove(gox, goy, goz, gtx, gty, gtz, instanceId);
return (loc.getGeoX() == gtx) && (loc.getGeoY() == gty);
}
@@ -829,7 +829,7 @@ public class GeoEngine
direction = 0;
// calculate next point coordinates
int e2 = 2 * d;
final int e2 = 2 * d;
if ((e2 > -dy) && (e2 < dx))
{
d -= dy;
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/GeoEnginePathfinding.java
+15 -15
View File
@@ -39,18 +39,18 @@ final class GeoEnginePathfinding extends GeoEngine
{
super();
String[] array = Config.PATHFIND_BUFFERS.split(";");
final String[] array = Config.PATHFIND_BUFFERS.split(";");
_buffers = new BufferHolder[array.length];
int count = 0;
for (int i = 0; i < array.length; i++)
{
String buf = array[i];
String[] args = buf.split("x");
final String buf = array[i];
final String[] args = buf.split("x");
try
{
int size = Integer.parseInt(args[1]);
final int size = Integer.parseInt(args[1]);
count += size;
_buffers[i] = new BufferHolder(Integer.parseInt(args[0]), size);
}
@@ -67,24 +67,24 @@ final class GeoEnginePathfinding extends GeoEngine
public List<Location> findPath(int ox, int oy, int oz, int tx, int ty, int tz, int instance)
{
// get origin and check existing geo coords
int gox = getGeoX(ox);
int goy = getGeoY(oy);
final int gox = getGeoX(ox);
final int goy = getGeoY(oy);
if (!hasGeoPos(gox, goy))
{
return null;
}
short goz = getHeightNearest(gox, goy, oz);
final short goz = getHeightNearest(gox, goy, oz);
// get target and check existing geo coords
int gtx = getGeoX(tx);
int gty = getGeoY(ty);
final int gtx = getGeoX(tx);
final int gty = getGeoY(ty);
if (!hasGeoPos(gtx, gty))
{
return null;
}
short gtz = getHeightNearest(gtx, gty, tz);
final short gtz = getHeightNearest(gtx, gty, tz);
// Prepare buffer for pathfinding calculations
final NodeBuffer buffer = getBuffer(64 + (2 * Math.max(Math.abs(gox - gtx), Math.abs(goy - gty))));
@@ -97,7 +97,7 @@ final class GeoEnginePathfinding extends GeoEngine
List<Location> path = null;
try
{
Node result = buffer.findPath(gox, goy, goz, gtx, gty, gtz);
final Node result = buffer.findPath(gox, goy, goz, gtx, gty, gtz);
if (result == null)
{
@@ -123,7 +123,7 @@ final class GeoEnginePathfinding extends GeoEngine
}
// get path list iterator
ListIterator<Location> point = path.listIterator();
final ListIterator<Location> point = path.listIterator();
// get node A (origin)
int nodeAx = gox;
@@ -138,10 +138,10 @@ final class GeoEnginePathfinding extends GeoEngine
while (point.hasNext() && (count++ < Config.MAX_ITERATIONS))
{
// get node C
GeoLocation nodeC = (GeoLocation) path.get(point.nextIndex());
final GeoLocation nodeC = (GeoLocation) path.get(point.nextIndex());
// check movement from node A to node C
GeoLocation loc = checkMove(nodeAx, nodeAy, nodeAz, nodeC.getGeoX(), nodeC.getGeoY(), nodeC.getZ(), instance);
final GeoLocation loc = checkMove(nodeAx, nodeAy, nodeAz, nodeC.getGeoX(), nodeC.getGeoY(), nodeC.getZ(), instance);
if ((loc.getGeoX() == nodeC.getGeoX()) && (loc.getGeoY() == nodeC.getGeoY()))
{
// can move from node A to node C
@@ -174,7 +174,7 @@ final class GeoEnginePathfinding extends GeoEngine
private static List<Location> constructPath(Node target)
{
// create empty list
LinkedList<Location> list = new LinkedList<>();
final LinkedList<Location> list = new LinkedList<>();
// set direction X/Y
int dx = 0;
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/geodata/BlockMultilayer.java
+2 -2
View File
@@ -86,7 +86,7 @@ public class BlockMultilayer extends ABlock
if (format != GeoFormat.L2D)
{
// get data
short data = bb.getShort();
final short data = bb.getShort();
// add nswe and height
_temp.put((byte) (data & 0x000F));
@@ -453,7 +453,7 @@ public class BlockMultilayer extends ABlock
for (int i = 0; i < GeoStructure.BLOCK_CELLS; i++)
{
// write layers count
byte layers = _buffer[index++];
final byte layers = _buffer[index++];
stream.write(layers);
// write cell data
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/geoengine/pathfinding/NodeBuffer.java
+3 -3
View File
@@ -133,7 +133,7 @@ public class NodeBuffer
private final void expand()
{
// can't move anywhere, don't expand
byte nswe = _current.getLoc().getNSWE();
final byte nswe = _current.getLoc().getNSWE();
if (nswe == 0)
{
return;
@@ -217,7 +217,7 @@ public class NodeBuffer
}
// get node
Node result = _buffer[ix][iy];
final Node result = _buffer[ix][iy];
// check and update
if (result.getLoc() == null)
@@ -239,7 +239,7 @@ public class NodeBuffer
private final void addNode(int x, int y, short z, int weight)
{
// get node to be expanded
Node node = getNode(x, y, z);
final Node node = getNode(x, y, z);
if (node == null)
{
return;
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/GrandBossManager.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class GrandBossManager implements IStorable
info.set("respawn_time", rs.getLong("respawn_time"));
info.set("currentHP", rs.getDouble("currentHP"));
info.set("currentMP", rs.getDouble("currentMP"));
int status = rs.getInt("status");
final int status = rs.getInt("status");
_bossStatus.put(bossId, status);
_storedInfo.put(bossId, info);
LOGGER.info(getClass().getSimpleName() + ": " + NpcData.getInstance().getTemplate(bossId).getName() + "(" + bossId + ") status is " + status + ".");
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/InstanceManager.java
+1 -1
View File
@@ -227,7 +227,7 @@ public class InstanceManager implements IXmlReader
}
case "instance":
{
NamedNodeMap attrs = n.getAttributes();
final NamedNodeMap attrs = n.getAttributes();
_instanceTemplates.put(parseInteger(attrs, "id"), new File("data/instances/").toURI().relativize(f.toURI()).getPath());
break;
}
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/PremiumManager.java
+8 -8
View File
@@ -95,7 +95,7 @@ public class PremiumManager
private final Consumer<OnPlayerLogout> playerLogoutEvent = (event) ->
{
PlayerInstance player = event.getPlayer();
final PlayerInstance player = event.getPlayer();
stopExpireTask(player);
};
@@ -111,7 +111,7 @@ public class PremiumManager
*/
private void startExpireTask(PlayerInstance player, long delay)
{
ScheduledFuture<?> task = ThreadPool.schedule(new PremiumExpireTask(player), delay);
final ScheduledFuture<?> task = ThreadPool.schedule(new PremiumExpireTask(player), delay);
expiretasks.put(player.getAccountName(), task);
}
@@ -155,11 +155,11 @@ public class PremiumManager
public void addPremiumTime(String accountName, int timeValue, TimeUnit timeUnit)
{
long addTime = timeUnit.toMillis(timeValue);
long now = System.currentTimeMillis();
final long addTime = timeUnit.toMillis(timeValue);
final long now = System.currentTimeMillis();
// new premium task at least from now
long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName));
long newPremiumExpiration = oldPremiumExpiration + addTime;
final long oldPremiumExpiration = Math.max(now, getPremiumExpiration(accountName));
final long newPremiumExpiration = oldPremiumExpiration + addTime;
// UPDATE DATABASE
try (Connection con = DatabaseFactory.getConnection();
@@ -178,7 +178,7 @@ public class PremiumManager
premiumData.put(accountName, newPremiumExpiration);
// UPDATE PlAYER PREMIUMSTATUS
PlayerInstance playerOnline = World.getInstance().getPlayers().stream().filter(p -> accountName.equals(p.getAccountName())).findFirst().orElse(null);
final PlayerInstance playerOnline = World.getInstance().getPlayers().stream().filter(p -> accountName.equals(p.getAccountName())).findFirst().orElse(null);
if (playerOnline != null)
{
stopExpireTask(playerOnline);
@@ -195,7 +195,7 @@ public class PremiumManager
{
if (checkOnline)
{
PlayerInstance playerOnline = World.getInstance().getPlayers().stream().filter(p -> accountName.equals(p.getAccountName())).findFirst().orElse(null);
final PlayerInstance playerOnline = World.getInstance().getPlayers().stream().filter(p -> accountName.equals(p.getAccountName())).findFirst().orElse(null);
if ((playerOnline != null) && playerOnline.hasPremiumStatus())
{
playerOnline.setPremiumStatus(false);
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/instancemanager/RaidBossSpawnManager.java
+1 -1
View File
@@ -326,7 +326,7 @@ public class RaidBossSpawnManager
{
for (Entry<Integer, StatsSet> entry : _storedInfo.entrySet())
{
Integer bossId = entry.getKey();
final Integer bossId = entry.getKey();
if (bossId == null)
{
continue;
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/Territory.java
+1 -1
View File
@@ -170,7 +170,7 @@ public class Territory
int zmin = _zMin;
for (Point p1 : _points)
{
double distance = Math.hypot(p1._x - x, p1._y - y);
final double distance = Math.hypot(p1._x - x, p1._y - y);
if ((curdistance == 0) || (distance < curdistance))
{
curdistance = distance;
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Creature.java
+4 -4
View File
@@ -1994,7 +1994,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
boolean canCast = true;
if ((skill.getTargetType() == TargetType.GROUND) && isPlayer())
{
Location wp = getActingPlayer().getCurrentSkillWorldPosition();
final Location wp = getActingPlayer().getCurrentSkillWorldPosition();
if (!zoneRegion.checkEffectRangeInsidePeaceZone(skill, wp.getX(), wp.getY(), wp.getZ()))
{
canCast = false;
@@ -3906,7 +3906,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
final int xPrev = getX();
final int yPrev = getY();
int zPrev = getZ(); // the z coordinate may be modified by coordinate synchronizations
final int zPrev = getZ(); // the z coordinate may be modified by coordinate synchronizations
double dx;
double dy;
@@ -5724,12 +5724,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if ((skillEffectPoint > 0) && attackable.hasAI() && (attackable.getAI().getIntention() == AI_INTENTION_ATTACK))
{
WorldObject npcTarget = attackable.getTarget();
final WorldObject npcTarget = attackable.getTarget();
for (WorldObject skillTarget : targets)
{
if ((npcTarget == skillTarget) || (npcMob == skillTarget))
{
Creature originalCaster = isSummon() ? this : player;
final Creature originalCaster = isSummon() ? this : player;
attackable.addDamageHate(originalCaster, 0, (skillEffectPoint * 150) / (attackable.getLevel() + 7));
}
}
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Npc.java
+1 -1
View File
@@ -151,7 +151,7 @@ public class Npc extends Creature
private int _shotsMask = 0;
private int _killingBlowWeaponId;
/** Map of summoned NPCs by this NPC. */
private volatile Map<Integer, Npc> _summonedNpcs = null;
private Map<Integer, Npc> _summonedNpcs = null;
/**
* Creates a NPC.
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Summon.java
+1 -1
View File
@@ -307,7 +307,7 @@ public abstract class Summon extends Playable
return;
}
AggroInfo info = targetMob.getAggroList().get(this);
final AggroInfo info = targetMob.getAggroList().get(this);
if (info != null)
{
targetMob.addDamageHate(_owner, info.getDamage(), info.getHate());
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Vehicle.java
+2 -2
View File
@@ -289,14 +289,14 @@ public abstract class Vehicle extends Creature
{
if (itemId > 0)
{
ItemInstance ticket = player.getInventory().getItemByItemId(itemId);
final ItemInstance ticket = player.getInventory().getItemByItemId(itemId);
if ((ticket == null) || (player.getInventory().destroyItem("Boat", ticket, count, player, this) == null))
{
player.sendPacket(SystemMessageId.YOU_DO_NOT_POSSESS_THE_CORRECT_TICKET_TO_BOARD_THE_BOAT);
player.teleToLocation(new Location(oustX, oustY, oustZ), true);
return;
}
InventoryUpdate iu = new InventoryUpdate();
final InventoryUpdate iu = new InventoryUpdate();
iu.addModifiedItem(ticket);
player.sendPacket(iu);
}
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java
+3 -3
View File
@@ -113,7 +113,7 @@ public class ChestInstance extends MonsterInstance
public void chestTrap(Creature player)
{
int trapSkillId = 0;
int rnd = Rnd.get(120);
final int rnd = Rnd.get(120);
if (getTemplate().getLevel() >= 61)
{
@@ -198,7 +198,7 @@ public class ChestInstance extends MonsterInstance
private boolean handleCast(Creature player, int skillId)
{
int skillLevel = 1;
byte lvl = getTemplate().getLevel();
final byte lvl = getTemplate().getLevel();
if ((lvl > 20) && (lvl <= 40))
{
skillLevel = 3;
@@ -217,7 +217,7 @@ public class ChestInstance extends MonsterInstance
return false;
}
Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
if (!player.isAffectedBySkill(skillId))
{
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/DoorInstance.java
+1 -1
View File
@@ -417,7 +417,7 @@ public class DoorInstance extends Creature
@Override
public void broadcastStatusUpdate()
{
Collection<PlayerInstance> knownPlayers = World.getInstance().getVisibleObjects(this, PlayerInstance.class);
final Collection<PlayerInstance> knownPlayers = World.getInstance().getVisibleObjects(this, PlayerInstance.class);
if ((knownPlayers == null) || knownPlayers.isEmpty())
{
return;
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/GuardInstance.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class GuardInstance extends Attackable
}
if (Config.FACTION_SYSTEM_ENABLED && Config.FACTION_GUARDS_ENABLED && attacker.isPlayable())
{
PlayerInstance player = attacker.getActingPlayer();
final PlayerInstance player = attacker.getActingPlayer();
if ((player.isGood() && getTemplate().isClan(Config.FACTION_EVIL_TEAM_NAME)) || (player.isEvil() && getTemplate().isClan(Config.FACTION_GOOD_TEAM_NAME)))
{
return true;
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/OlympiadManagerInstance.java
+14 -14
View File
@@ -73,8 +73,8 @@ public class OlympiadManagerInstance extends Npc
{
if (command.startsWith("OlympiadDesc"))
{
int val = Integer.parseInt(command.substring(13, 14));
String suffix = command.substring(14);
final int val = Integer.parseInt(command.substring(13, 14));
final String suffix = command.substring(14);
showChatWindow(player, val, suffix);
}
else if (command.startsWith("OlympiadNoble"))
@@ -84,7 +84,7 @@ public class OlympiadManagerInstance extends Npc
return;
}
int val = Integer.parseInt(command.substring(14));
final int val = Integer.parseInt(command.substring(14));
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
switch (val)
@@ -98,7 +98,7 @@ public class OlympiadManagerInstance extends Npc
{
int classed = 0;
int nonClassed = 0;
int[] array = Olympiad.getInstance().getWaitingList();
final int[] array = Olympiad.getInstance().getWaitingList();
if (array != null)
{
@@ -124,7 +124,7 @@ public class OlympiadManagerInstance extends Npc
}
case 3:
{
int points = Olympiad.getInstance().getNoblePoints(player.getObjectId());
final int points = Olympiad.getInstance().getNoblePoints(player.getObjectId());
html.setFile(player, Olympiad.OLYMPIAD_HTML_PATH + "noble_points1.htm");
html.replace("%points%", String.valueOf(points));
html.replace("%objectId%", String.valueOf(getObjectId()));
@@ -169,7 +169,7 @@ public class OlympiadManagerInstance extends Npc
}
case 9:
{
int point = Olympiad.getInstance().getLastNobleOlympiadPoints(player.getObjectId());
final int point = Olympiad.getInstance().getLastNobleOlympiadPoints(player.getObjectId());
html.setFile(player, Olympiad.OLYMPIAD_HTML_PATH + "noble_points2.htm");
html.replace("%points%", String.valueOf(point));
html.replace("%objectId%", String.valueOf(getObjectId()));
@@ -196,7 +196,7 @@ public class OlympiadManagerInstance extends Npc
else if (command.startsWith("OlyBuff"))
{
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
String[] params = command.split(" ");
final String[] params = command.split(" ");
if (!Util.isDigit(params[1]))
{
@@ -242,20 +242,20 @@ public class OlympiadManagerInstance extends Npc
}
else if (command.startsWith("Olympiad"))
{
int val = Integer.parseInt(command.substring(9, 10));
final int val = Integer.parseInt(command.substring(9, 10));
NpcHtmlMessage reply = new NpcHtmlMessage(getObjectId());
final NpcHtmlMessage reply = new NpcHtmlMessage(getObjectId());
switch (val)
{
case 1:
{
Map<Integer, String> matches = Olympiad.getInstance().getMatchList();
final Map<Integer, String> matches = Olympiad.getInstance().getMatchList();
reply.setFile(player, Olympiad.OLYMPIAD_HTML_PATH + "olympiad_observe1.htm");
for (int i = 0; i < Olympiad.getStadiumCount(); i++)
{
int arenaID = i + 1;
final int arenaID = i + 1;
// &$906; -> \\&\\$906;
reply.replace("%title" + arenaID + "%", matches.containsKey(i) ? matches.get(i) : "\\&$906;");
@@ -267,10 +267,10 @@ public class OlympiadManagerInstance extends Npc
case 2:
{
// for example >> Olympiad 1_88
int classId = Integer.parseInt(command.substring(11));
final int classId = Integer.parseInt(command.substring(11));
if (((classId >= 88) && (classId <= 118)) || ((classId >= 131) && (classId <= 134)) || (classId == 136))
{
List<String> names = Olympiad.getInstance().getClassLeaderBoard(classId);
final List<String> names = Olympiad.getInstance().getClassLeaderBoard(classId);
reply.setFile(player, Olympiad.OLYMPIAD_HTML_PATH + "olympiad_ranking.htm");
int index = 1;
@@ -297,7 +297,7 @@ public class OlympiadManagerInstance extends Npc
}
case 3:
{
int id = Integer.parseInt(command.substring(11));
final int id = Integer.parseInt(command.substring(11));
Olympiad.addSpectator(id, player, true);
break;
}
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+6 -6
View File
@@ -1944,7 +1944,7 @@ public class PlayerInstance extends Playable
PreparedStatement ps = con.prepareStatement(RESTORE_CHAR_RECOMS))
{
ps.setInt(1, getObjectId());
ResultSet rset = ps.executeQuery();
final ResultSet rset = ps.executeQuery();
while (rset.next())
{
_recomChars.add(rset.getInt("target_id"));
@@ -1958,11 +1958,11 @@ public class PlayerInstance extends Playable
private void checkRecom(int recsHave, int recsLeft)
{
Calendar check = Calendar.getInstance();
final Calendar check = Calendar.getInstance();
check.setTimeInMillis(_lastRecomUpdate);
check.add(Calendar.DAY_OF_MONTH, 1);
Calendar min = Calendar.getInstance();
final Calendar min = Calendar.getInstance();
_recomHave = recsHave;
_recomLeft = recsLeft;
@@ -2014,7 +2014,7 @@ public class PlayerInstance extends Playable
}
// If we have to update last update time, but it's now before 13, we should set it to yesterday
Calendar update = Calendar.getInstance();
final Calendar update = Calendar.getInstance();
if (update.get(Calendar.HOUR_OF_DAY) < 13)
{
update.add(Calendar.DAY_OF_MONTH, -1);
@@ -4176,7 +4176,7 @@ public class PlayerInstance extends Playable
if ((players != null) && !players.isEmpty())
{
ExOlympiadUserInfo olyInfo = new ExOlympiadUserInfo(this);
final ExOlympiadUserInfo olyInfo = new ExOlympiadUserInfo(this);
for (PlayerInstance player : players)
{
@@ -4190,7 +4190,7 @@ public class PlayerInstance extends Playable
players = Olympiad.getInstance().getSpectators(_olympiadGameId);
if ((players != null) && !players.isEmpty())
{
ExOlympiadUserInfo olyInfo = new ExOlympiadUserInfo(this);
final ExOlympiadUserInfo olyInfo = new ExOlympiadUserInfo(this);
for (PlayerInstance spectator : players)
{
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
+2 -2
View File
@@ -49,8 +49,8 @@ public class SchemeBufferInstance extends Npc
// Simple hack to use createscheme bypass with a space.
command = command.replace("createscheme ", "createscheme;");
StringTokenizer st = new StringTokenizer(command, ";");
String currentCommand = st.nextToken();
final StringTokenizer st = new StringTokenizer(command, ";");
final String currentCommand = st.nextToken();
if (currentCommand.startsWith("menu"))
{
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/TrapInstance.java
+1 -1
View File
@@ -332,7 +332,7 @@ public class TrapInstance extends Npc
else
{
final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_DONE_S3_POINTS_OF_DAMAGE_TO_C2);
sm.addString(this.getName());
sm.addString(getName());
sm.addString(target.getName());
sm.addInt(damage);
_owner.sendPacket(sm);
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+1 -1
View File
@@ -908,7 +908,7 @@ public class VillageMasterInstance extends NpcInstance
}
}
Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
final Set<ClassId> unavailableClasses = subclassSetMap.get(pClass);
if (unavailableClasses != null)
{
subclasses.removeAll(unavailableClasses);
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
+1 -1
View File
@@ -718,7 +718,7 @@ public class PlayerStat extends PlayableStat
if (points < 0) // vitality consumed
{
int stat = (int) calcStat(Stats.VITALITY_CONSUME_RATE, 1, getActiveChar(), null);
final int stat = (int) calcStat(Stats.VITALITY_CONSUME_RATE, 1, getActiveChar(), null);
if (stat == 0)
{
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/base/ClassId.java
+1 -1
View File
@@ -140,7 +140,7 @@ public enum ClassId implements IIdentifiable
FORTUNE_SEEKER(117, false, Race.DWARF, BOUNTY_HUNTER),
MAESTRO(118, false, Race.DWARF, WARSMITH),
MALE_SOLDIER(123, false, Race.KAMAEL, null),
FEMALE_SOLDIER(124, false, Race.KAMAEL, null),
TROOPER(125, false, Race.KAMAEL, MALE_SOLDIER),
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/Instance.java
+1 -1
View File
@@ -419,7 +419,7 @@ public class Instance
*/
public List<Npc> spawnGroup(String groupName)
{
List<Npc> spawnedNpcs = new ArrayList<>();
final List<Npc> spawnedNpcs = new ArrayList<>();
for (StatsSet set : _spawnTemplates)
{
if (set.getString("spawnGroup").equals(groupName))
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/multisell/PreparedListContainer.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class PreparedListContainer extends ListContainer
{
if (!entry.getIngredients().isEmpty())
{
int ingredientId = entry.getIngredients().get(0).getItemId();
final int ingredientId = entry.getIngredients().get(0).getItemId();
for (ItemInstance item : items)
{
if (!item.isEquipped() && (item.getId() == ingredientId))
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/olympiad/Olympiad.java
+63 -63
View File
@@ -208,7 +208,7 @@ public class Olympiad extends ListenersContainer
{
LOGGER.log(Level.INFO, "Olympiad System: failed to load data from database, trying to load from file.");
Properties olympiadProperties = new Properties();
final Properties olympiadProperties = new Properties();
InputStream is = null;
try
{
@@ -273,7 +273,7 @@ public class Olympiad extends ListenersContainer
while (rset.next())
{
statData = new StatsSet();
int charId = rset.getInt(CHAR_ID);
final int charId = rset.getInt(CHAR_ID);
statData.set(CLASS_ID, rset.getInt(CLASS_ID));
statData.set(CHAR_NAME, rset.getString(CHAR_NAME));
statData.set(POINTS, rset.getInt(POINTS));
@@ -333,7 +333,7 @@ public class Olympiad extends ListenersContainer
public void loadNoblesRank()
{
NOBLES_RANK.clear();
Map<Integer, Integer> tmpPlace = new HashMap<>();
final Map<Integer, Integer> tmpPlace = new HashMap<>();
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement statement = con.prepareStatement(GET_ALL_CLASSIFIED_NOBLESS);
ResultSet rset = statement.executeQuery())
@@ -487,7 +487,7 @@ public class Olympiad extends ListenersContainer
@Override
public void run()
{
SystemMessage sm = new SystemMessage(SystemMessageId.ROUND_S1_OF_THE_GRAND_OLYMPIAD_GAMES_HAS_NOW_ENDED);
final SystemMessage sm = new SystemMessage(SystemMessageId.ROUND_S1_OF_THE_GRAND_OLYMPIAD_GAMES_HAS_NOW_ENDED);
sm.addInt(_currentCycle);
Broadcast.toAllOnlinePlayers(sm);
@@ -508,7 +508,7 @@ public class Olympiad extends ListenersContainer
saveOlympiadStatus();
updateMonthlyData();
Calendar validationEnd = Calendar.getInstance();
final Calendar validationEnd = Calendar.getInstance();
_validationEnd = validationEnd.getTimeInMillis() + VALIDATION_PERIOD;
loadNoblesRank();
@@ -591,7 +591,7 @@ public class Olympiad extends ListenersContainer
if (_classBasedRegisters.containsKey(noble.getClassId().getId()))
{
List<PlayerInstance> classed = _classBasedRegisters.get(noble.getClassId().getId());
final List<PlayerInstance> classed = _classBasedRegisters.get(noble.getClassId().getId());
for (PlayerInstance participant : classed)
{
if (participant.getObjectId() == noble.getObjectId())
@@ -614,7 +614,7 @@ public class Olympiad extends ListenersContainer
if (!NOBLES.containsKey(noble.getObjectId()))
{
StatsSet statDat = new StatsSet();
final StatsSet statDat = new StatsSet();
statDat.set(CLASS_ID, noble.getClassId().getId());
statDat.set(CHAR_NAME, noble.getName());
statDat.set(POINTS, DEFAULT_POINTS);
@@ -642,7 +642,7 @@ public class Olympiad extends ListenersContainer
{
if (_classBasedRegisters.containsKey(noble.getClassId().getId()))
{
List<PlayerInstance> classed = _classBasedRegisters.get(noble.getClassId().getId());
final List<PlayerInstance> classed = _classBasedRegisters.get(noble.getClassId().getId());
classed.add(noble);
_classBasedRegisters.remove(noble.getClassId().getId());
@@ -650,7 +650,7 @@ public class Olympiad extends ListenersContainer
}
else
{
List<PlayerInstance> classed = new ArrayList<>();
final List<PlayerInstance> classed = new ArrayList<>();
classed.add(noble);
_classBasedRegisters.put(noble.getClassId().getId(), classed);
@@ -696,7 +696,7 @@ public class Olympiad extends ListenersContainer
protected static List<Integer> hasEnoughRegisteredClassed()
{
List<Integer> result = new ArrayList<>();
final List<Integer> result = new ArrayList<>();
for (Integer classList : getRegisteredClassBased().keySet())
{
@@ -734,7 +734,7 @@ public class Olympiad extends ListenersContainer
}
else if ((_classBasedRegisters != null) && _classBasedRegisters.containsKey(noble.getClassId().getId()))
{
List<PlayerInstance> classed = _classBasedRegisters.get(noble.getClassId().getId());
final List<PlayerInstance> classed = _classBasedRegisters.get(noble.getClassId().getId());
if ((classed != null) && classed.contains(noble))
{
result = true;
@@ -790,7 +790,7 @@ public class Olympiad extends ListenersContainer
}
else
{
List<PlayerInstance> classed = _classBasedRegisters.get(noble.getClassId().getId());
final List<PlayerInstance> classed = _classBasedRegisters.get(noble.getClassId().getId());
classed.remove(noble);
_classBasedRegisters.remove(noble.getClassId().getId());
@@ -815,7 +815,7 @@ public class Olympiad extends ListenersContainer
OlympiadManager.getInstance().getOlympiadGame(player.getOlympiadGameId()).handleDisconnect(player);
}
List<PlayerInstance> classed = _classBasedRegisters.get(player.getClassId().getId());
final List<PlayerInstance> classed = _classBasedRegisters.get(player.getClassId().getId());
if (_nonClassBasedRegisters.contains(player))
{
@@ -844,14 +844,14 @@ public class Olympiad extends ListenersContainer
synchronized (this)
{
long milliToStart = getMillisToCompBegin();
final long milliToStart = getMillisToCompBegin();
double numSecs = (milliToStart / 1000) % 60;
final double numSecs = (milliToStart / 1000) % 60;
double countDown = ((milliToStart / 1000) - numSecs) / 60;
int numMins = (int) Math.floor(countDown % 60);
final int numMins = (int) Math.floor(countDown % 60);
countDown = (countDown - numMins) / 60;
int numHours = (int) Math.floor(countDown % 24);
int numDays = (int) Math.floor((countDown - numHours) / 24);
final int numHours = (int) Math.floor(countDown % 24);
final int numDays = (int) Math.floor((countDown - numHours) / 24);
LOGGER.info("Olympiad System: Competition Period Starts in " + numDays + " days, " + numHours + " hours and " + numMins + " mins.");
@@ -866,16 +866,16 @@ public class Olympiad extends ListenersContainer
}
_inCompPeriod = true;
OlympiadManager om = OlympiadManager.getInstance();
final OlympiadManager om = OlympiadManager.getInstance();
Broadcast.toAllOnlinePlayers(new SystemMessage(SystemMessageId.SHARPEN_YOUR_SWORDS_TIGHTEN_THE_STITCHING_IN_YOUR_ARMOR_AND_MAKE_HASTE_TO_A_GRAND_OLYMPIAD_MANAGER_BATTLES_IN_THE_GRAND_OLYMPIAD_GAMES_ARE_NOW_TAKING_PLACE));
LOGGER.info("Olympiad System: Olympiad Game Started");
LOGGER_OLYMPIAD.info("Result,Player1,Player2,Player1 HP,Player2 HP,Player1 Damage,Player2 Damage,Points,Classed");
Thread olyCycle = new Thread(om);
final Thread olyCycle = new Thread(om);
olyCycle.start();
long regEnd = getMillisToCompEnd() - 600000;
final long regEnd = getMillisToCompEnd() - 600000;
if (regEnd > 0)
{
ThreadPool.schedule(() -> Broadcast.toAllOnlinePlayers(new SystemMessage(SystemMessageId.THE_GRAND_OLYMPIAD_REGISTRATION_PERIOD_HAS_ENDED)), regEnd);
@@ -943,7 +943,7 @@ public class Olympiad extends ListenersContainer
protected void setNewOlympiadEnd()
{
SystemMessage sm = new SystemMessage(SystemMessageId.ROUND_S1_OF_THE_GRAND_OLYMPIAD_GAMES_HAS_STARTED);
final SystemMessage sm = new SystemMessage(SystemMessageId.ROUND_S1_OF_THE_GRAND_OLYMPIAD_GAMES_HAS_STARTED);
sm.addInt(_currentCycle);
Broadcast.toAllOnlinePlayers(sm);
@@ -963,13 +963,13 @@ public class Olympiad extends ListenersContainer
}
else
{
Calendar currentTime = Calendar.getInstance();
final Calendar currentTime = Calendar.getInstance();
currentTime.set(Calendar.AM_PM, Calendar.AM);
currentTime.set(Calendar.HOUR, 12);
currentTime.set(Calendar.MINUTE, 0);
currentTime.set(Calendar.SECOND, 0);
Calendar nextChange = Calendar.getInstance();
final Calendar nextChange = Calendar.getInstance();
switch (Config.ALT_OLY_PERIOD)
{
@@ -1123,7 +1123,7 @@ public class Olympiad extends ListenersContainer
addWeeklyPoints();
LOGGER.info("Olympiad System: Added weekly points to nobles");
Calendar nextChange = Calendar.getInstance();
final Calendar nextChange = Calendar.getInstance();
_nextWeeklyChange = nextChange.getTimeInMillis() + WEEKLY_PERIOD;
}, getMillisToWeekChange(), WEEKLY_PERIOD);
}
@@ -1137,7 +1137,7 @@ public class Olympiad extends ListenersContainer
for (Entry<Integer, StatsSet> entry : NOBLES.entrySet())
{
StatsSet nobleInfo = entry.getValue();
final StatsSet nobleInfo = entry.getValue();
int currentPoints = nobleInfo.getInt(POINTS);
currentPoints += WEEKLY_POINTS;
nobleInfo.set(POINTS, currentPoints);
@@ -1238,7 +1238,7 @@ public class Olympiad extends ListenersContainer
public int[] getWaitingList()
{
int[] array = new int[2];
final int[] array = new int[2];
if (!inCompPeriod())
{
@@ -1275,21 +1275,21 @@ public class Olympiad extends ListenersContainer
{
for (Entry<Integer, StatsSet> entry : NOBLES.entrySet())
{
StatsSet nobleInfo = entry.getValue();
final StatsSet nobleInfo = entry.getValue();
if (nobleInfo == null)
{
continue;
}
int charId = entry.getKey();
int classId = nobleInfo.getInt(CLASS_ID);
int points = nobleInfo.getInt(POINTS);
int compDone = nobleInfo.getInt(COMP_DONE);
int compWon = nobleInfo.getInt(COMP_WON);
int compLost = nobleInfo.getInt(COMP_LOST);
int compDrawn = nobleInfo.getInt(COMP_DRAWN);
boolean toSave = nobleInfo.getBoolean("to_save");
final int charId = entry.getKey();
final int classId = nobleInfo.getInt(CLASS_ID);
final int points = nobleInfo.getInt(POINTS);
final int compDone = nobleInfo.getInt(COMP_DONE);
final int compWon = nobleInfo.getInt(COMP_WON);
final int compLost = nobleInfo.getInt(COMP_LOST);
final int compDrawn = nobleInfo.getInt(COMP_DRAWN);
final boolean toSave = nobleInfo.getBoolean("to_save");
try (PreparedStatement statement = con.prepareStatement(toSave ? OLYMPIAD_SAVE_NOBLES : OLYMPIAD_UPDATE_NOBLES))
{
@@ -1389,11 +1389,11 @@ public class Olympiad extends ListenersContainer
continue;
}
int charId = entry.getKey();
int classId = nobleInfo.getInt(CLASS_ID);
String charName = nobleInfo.getString(CHAR_NAME);
int points = nobleInfo.getInt(POINTS);
int compDone = nobleInfo.getInt(COMP_DONE);
final int charId = entry.getKey();
final int classId = nobleInfo.getInt(CLASS_ID);
final String charName = nobleInfo.getString(CHAR_NAME);
final int points = nobleInfo.getInt(POINTS);
final int compDone = nobleInfo.getInt(COMP_DONE);
record = new LogRecord(Level.INFO, charName);
record.setParameters(new Object[]
@@ -1413,7 +1413,7 @@ public class Olympiad extends ListenersContainer
PreparedStatement statement = con.prepareStatement(OLYMPIAD_GET_HEROS))
{
StatsSet hero;
List<StatsSet> soulHounds = new ArrayList<>();
final List<StatsSet> soulHounds = new ArrayList<>();
for (int element : HERO_IDS)
{
statement.setInt(1, element);
@@ -1457,7 +1457,7 @@ public class Olympiad extends ListenersContainer
case 1:
{
hero = new StatsSet();
StatsSet winner = soulHounds.get(0);
final StatsSet winner = soulHounds.get(0);
hero.set(CLASS_ID, winner.getInt(CLASS_ID));
hero.set(CHAR_ID, winner.getInt(CHAR_ID));
hero.set(CHAR_NAME, winner.getString(CHAR_NAME));
@@ -1476,14 +1476,14 @@ public class Olympiad extends ListenersContainer
{
hero = new StatsSet();
StatsSet winner;
StatsSet hero1 = soulHounds.get(0);
StatsSet hero2 = soulHounds.get(1);
int hero1Points = hero1.getInt(POINTS);
int hero2Points = hero2.getInt(POINTS);
int hero1Comps = hero1.getInt(COMP_DONE);
int hero2Comps = hero2.getInt(COMP_DONE);
int hero1Wins = hero1.getInt(COMP_WON);
int hero2Wins = hero2.getInt(COMP_WON);
final StatsSet hero1 = soulHounds.get(0);
final StatsSet hero2 = soulHounds.get(1);
final int hero1Points = hero1.getInt(POINTS);
final int hero2Points = hero2.getInt(POINTS);
final int hero1Comps = hero1.getInt(COMP_DONE);
final int hero2Comps = hero2.getInt(COMP_DONE);
final int hero1Wins = hero1.getInt(COMP_WON);
final int hero2Wins = hero2.getInt(COMP_WON);
if (hero1Points > hero2Points)
{
@@ -1541,7 +1541,7 @@ public class Olympiad extends ListenersContainer
public List<String> getClassLeaderBoard(int classId)
{
final List<String> names = new ArrayList<>();
String query = Config.ALT_OLY_SHOW_MONTHLY_WINNERS ? ((classId == 132) ? GET_EACH_CLASS_LEADER_SOULHOUND : GET_EACH_CLASS_LEADER) : ((classId == 132) ? GET_EACH_CLASS_LEADER_CURRENT_SOULHOUND : GET_EACH_CLASS_LEADER_CURRENT);
final String query = Config.ALT_OLY_SHOW_MONTHLY_WINNERS ? ((classId == 132) ? GET_EACH_CLASS_LEADER_SOULHOUND : GET_EACH_CLASS_LEADER) : ((classId == 132) ? GET_EACH_CLASS_LEADER_CURRENT_SOULHOUND : GET_EACH_CLASS_LEADER_CURRENT);
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement(query))
{
@@ -1644,7 +1644,7 @@ public class Olympiad extends ListenersContainer
return 0;
}
StatsSet noble = NOBLES.get(objId);
final StatsSet noble = NOBLES.get(objId);
if (noble == null)
{
return 0;
@@ -1682,7 +1682,7 @@ public class Olympiad extends ListenersContainer
return 0;
}
StatsSet noble = NOBLES.get(objId);
final StatsSet noble = NOBLES.get(objId);
if (noble == null)
{
return 0;
@@ -1698,7 +1698,7 @@ public class Olympiad extends ListenersContainer
return 0;
}
StatsSet noble = NOBLES.get(objId);
final StatsSet noble = NOBLES.get(objId);
if (noble == null)
{
return 0;
@@ -1714,7 +1714,7 @@ public class Olympiad extends ListenersContainer
return 0;
}
StatsSet noble = NOBLES.get(objId);
final StatsSet noble = NOBLES.get(objId);
if (noble == null)
{
return 0;
@@ -1739,13 +1739,13 @@ public class Olympiad extends ListenersContainer
public static void sendMatchList(PlayerInstance player)
{
NpcHtmlMessage message = new NpcHtmlMessage(0);
final NpcHtmlMessage message = new NpcHtmlMessage(0);
message.setFile(player, Olympiad.OLYMPIAD_HTML_PATH + "olympiad_observe2.htm");
Map<Integer, String> matches = getInstance().getMatchList();
final Map<Integer, String> matches = getInstance().getMatchList();
for (int i = 0; i < Olympiad.getStadiumCount(); i++)
{
int arenaId = i + 1;
final int arenaId = i + 1;
String state = "Initial State";
String players = "&nbsp;";
if (matches.containsKey(i))
@@ -1769,7 +1769,7 @@ public class Olympiad extends ListenersContainer
private static void handleSpectatorEnter(int gameId, PlayerInstance player)
{
OlympiadGame game = OlympiadManager.getInstance().getOlympiadGame(gameId);
final OlympiadGame game = OlympiadManager.getInstance().getOlympiadGame(gameId);
if (game != null)
{
if ((game._playerOne == null) || !game._playerOne.isInOlympiadMode() || !game._playerOne.isOlympiadStart())
@@ -1793,9 +1793,9 @@ public class Olympiad extends ListenersContainer
return;
}
String[] commands = command.split(" ");
int id = Integer.parseInt(commands[1]);
int arena = getSpectatorArena(player);
final String[] commands = command.split(" ");
final int id = Integer.parseInt(commands[1]);
final int arena = getSpectatorArena(player);
if (arena >= 0)
{
Olympiad.removeSpectator(arena, player);

Some files were not shown because too many files have changed in this diff Show More