");
@@ -492,7 +493,7 @@ public class AdminCommands extends Thread
activeChar.sendPacket(il);
activeChar.sendMessage("You have spawned " + num + " item(s) number " + id + " in your inventory.");
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
- final StringBuffer replyMSG = new StringBuffer("Item Creation Complete");
+ final StringBuilder replyMSG = new StringBuilder("Item Creation Complete");
replyMSG.append("");
replyMSG.append("
");
replyMSG.append("");
@@ -505,23 +506,23 @@ public class AdminCommands extends Thread
final PlayerInstance activeChar = client.getActiveChar();
final Collection allWorldPlayers = World.getInstance().getAllPlayers();
final PlayerInstance[] players = allWorldPlayers.toArray(new PlayerInstance[allWorldPlayers.size()]);
- final int MaxCharactersPerPage = 20;
- int MaxPages = players.length / MaxCharactersPerPage;
- final int modulus = players.length % MaxCharactersPerPage;
+ final int maxCharactersPerPage = 20;
+ int maxPages = players.length / maxCharactersPerPage;
+ final int modulus = players.length % maxCharactersPerPage;
if (modulus != 0)
{
- ++MaxPages;
+ ++maxPages;
}
- if (page > MaxPages)
+ if (page > maxPages)
{
- page = MaxPages;
+ page = maxPages;
}
- final int CharactersStart = MaxCharactersPerPage * page;
+ final int CharactersStart = maxCharactersPerPage * page;
final int CharactersEnd = players.length - CharactersStart;
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
- final StringBuffer replyMSG = new StringBuffer("Characters List");
+ final StringBuilder replyMSG = new StringBuilder("Characters List");
replyMSG.append("");
- for (int x = 0; x < MaxPages; ++x)
+ for (int x = 0; x < maxPages; ++x)
{
replyMSG.append("Page" + x + 1 + "\t");
}
@@ -543,12 +544,12 @@ public class AdminCommands extends Thread
activeChar.sendPacket(adminReply);
}
- private void showCharacterList(ClientThread client, String CharName)
+ private void showCharacterList(ClientThread client, String charName)
{
final PlayerInstance activeChar = client.getActiveChar();
- final PlayerInstance player = World.getInstance().getPlayer(CharName);
+ final PlayerInstance player = World.getInstance().getPlayer(charName);
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
- final StringBuffer replyMSG = new StringBuffer("Character Information");
+ final StringBuilder replyMSG = new StringBuilder("Character Information");
replyMSG.append("");
replyMSG.append(" ");
replyMSG.append("
" + player.getName() + "
");
@@ -609,7 +610,7 @@ public class AdminCommands extends Thread
final PlayerInstance activeChar = client.getActiveChar();
final PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate);
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
- final StringBuffer replyMSG = new StringBuffer("
Add Exp-Sp to " + player.getName() + "");
+ final StringBuilder replyMSG = new StringBuilder("Add Exp-Sp to " + player.getName() + "");
replyMSG.append("");
replyMSG.append(" ");
replyMSG.append("
");
@@ -628,11 +629,11 @@ public class AdminCommands extends Thread
activeChar.sendPacket(adminReply);
}
- private void adminAddExpSp(ClientThread client, String ExpSp)
+ private void adminAddExpSp(ClientThread client, String expSp)
{
final PlayerInstance activeChar = client.getActiveChar();
final PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate);
- final StringTokenizer st = new StringTokenizer(ExpSp);
+ final StringTokenizer st = new StringTokenizer(expSp);
if (st.countTokens() != 2)
{
addExpSp(client);
@@ -707,7 +708,7 @@ public class AdminCommands extends Thread
final PlayerInstance activeChar = client.getActiveChar();
final PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate);
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
- final StringBuffer replyMSG = new StringBuffer("
Editing character " + player.getName() + "");
+ final StringBuilder replyMSG = new StringBuilder("Editing character " + player.getName() + "");
replyMSG.append("");
replyMSG.append("
Caution ! Dont forget that modifying players stats can ruin the game...
");
replyMSG.append("Note: you must type all values to confirm modifications.
");
@@ -775,27 +776,27 @@ public class AdminCommands extends Thread
showMainPage(client);
}
- private void findCharacter(ClientThread client, String CharacterToFind)
+ private void findCharacter(ClientThread client, String characterToFind)
{
final PlayerInstance activeChar = client.getActiveChar();
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
- int CharactersFound = 0;
- final StringBuffer replyMSG = new StringBuffer("Character Search");
+ int charactersFound = 0;
+ final StringBuilder replyMSG = new StringBuilder("Character Search");
replyMSG.append("");
replyMSG.append(" ");
replyMSG.append("
");
replyMSG.append("
Name
Class
Level
");
for (PlayerInstance player : World.getInstance().getAllPlayers())
{
- if (!player.getName().startsWith(CharacterToFind))
+ if (!player.getName().startsWith(characterToFind))
{
continue;
}
- ++CharactersFound;
+ ++charactersFound;
replyMSG.append("
");
- if (CharactersFound == 0)
+ if (charactersFound == 0)
{
replyMSG.append(" Your search did not find any characters. Please try again:");
replyMSG.append("");
@@ -804,12 +805,12 @@ public class AdminCommands extends Thread
}
else
{
- replyMSG.append(" Found " + CharactersFound + " character");
- if (CharactersFound == 1)
+ replyMSG.append(" Found " + charactersFound + " character");
+ if (charactersFound == 1)
{
replyMSG.append(".");
}
- else if (CharactersFound > 1)
+ else if (charactersFound > 1)
{
replyMSG.append("s.");
}
@@ -826,7 +827,7 @@ public class AdminCommands extends Thread
final PlayerInstance activeChar = client.getActiveChar();
final PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate);
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
- final StringBuffer replyMSG = new StringBuffer("Teleport Character");
+ final StringBuilder replyMSG = new StringBuilder("Teleport Character");
replyMSG.append("");
replyMSG.append("The character you will teleport is " + player.getName() + ".");
replyMSG.append(" ");
@@ -844,7 +845,7 @@ public class AdminCommands extends Thread
activeChar.sendPacket(adminReply);
}
- private void teleportCharacter(ClientThread client, String Cords)
+ private void teleportCharacter(ClientThread client, String coords)
{
final PlayerInstance activeChar = client.getActiveChar();
final PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate);
@@ -854,7 +855,7 @@ public class AdminCommands extends Thread
}
else
{
- final StringTokenizer st = new StringTokenizer(Cords);
+ final StringTokenizer st = new StringTokenizer(coords);
final String x1 = st.nextToken();
final int x = Integer.parseInt(x1);
final String y1 = st.nextToken();
@@ -888,7 +889,7 @@ public class AdminCommands extends Thread
{
final PlayerInstance activeChar = client.getActiveChar();
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
- final StringBuffer replyMSG = new StringBuffer("Custom Spawn Menu");
+ final StringBuilder replyMSG = new StringBuilder("Custom Spawn Menu");
replyMSG.append(" Enter target player's name below. You may leave the field blank for self-spawn.
");
replyMSG.append("
");
replyMSG.append("
");
@@ -897,10 +898,10 @@ public class AdminCommands extends Thread
activeChar.sendPacket(adminReply);
}
- private void spawnMonster(ClientThread client, String monsterId, String CharName)
+ private void spawnMonster(ClientThread client, String monsterId, String charName)
{
final PlayerInstance activeChar = client.getActiveChar();
- final PlayerInstance targetPlayer = World.getInstance().getPlayer(CharName);
+ final PlayerInstance targetPlayer = World.getInstance().getPlayer(charName);
final int monsterTemplate = Integer.parseInt(monsterId);
final Npc template1 = NpcTable.getInstance().getTemplate(monsterTemplate);
if (template1 == null)
@@ -931,14 +932,13 @@ public class AdminCommands extends Thread
private int disconnectAllCharacters()
{
+ final LeaveWorld leaveWorld = new LeaveWorld();
for (PlayerInstance player : World.getInstance().getAllPlayers())
{
- final LeaveWorld ql = new LeaveWorld();
- player.sendPacket(ql);
+ player.sendPacket(leaveWorld);
try
{
player.getNetConnection().close();
- continue;
}
catch (IOException e)
{
@@ -952,8 +952,8 @@ public class AdminCommands extends Thread
{
secondsShut = seconds;
clientShut = client;
- final AdminCommands ShutDownThread = new AdminCommands();
- ShutDownThread.start();
+ final AdminCommands shutDownThread = new AdminCommands();
+ shutDownThread.start();
}
@Override
@@ -963,7 +963,7 @@ public class AdminCommands extends Thread
{
final PlayerInstance activeChar = clientShut.getActiveChar();
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
- final StringBuffer replyMSG = new StringBuffer("Shutdown Server");
+ final StringBuilder replyMSG = new StringBuilder("Shutdown Server");
replyMSG.append(" ");
replyMSG.append("Enter in seconds the time till the server
shutdowns bellow:");
replyMSG.append("");
@@ -1044,14 +1044,13 @@ public class AdminCommands extends Thread
fis = new FileInputStream(file);
final byte[] raw = new byte[fis.available()];
fis.read(raw);
- final String content = new String(raw, "UTF-8");
+ final String content = new String(raw, StandardCharsets.UTF_8);
final PlayerInstance activeChar = client.getActiveChar();
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
adminReply.setHtml(content);
activeChar.sendPacket(adminReply);
fis.close();
- return;
}
catch (Exception e)
{
@@ -1100,7 +1099,7 @@ public class AdminCommands extends Thread
final PlayerInstance activeChar = client.getActiveChar();
final PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate);
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
- final StringBuffer replyMSG = new StringBuffer("Remove skills of " + player.getName() + "");
+ final StringBuilder replyMSG = new StringBuilder("Remove skills of " + player.getName() + "");
replyMSG.append("");
replyMSG.append(" ");
replyMSG.append("
");
@@ -1131,7 +1130,7 @@ public class AdminCommands extends Thread
final PlayerInstance activeChar = client.getActiveChar();
final PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate);
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
- final StringBuffer replyMSG = new StringBuffer("
Modify skills of " + player.getName() + "");
+ final StringBuilder replyMSG = new StringBuilder("Modify skills of " + player.getName() + "");
replyMSG.append("");
replyMSG.append(" ");
replyMSG.append("
");
@@ -1261,24 +1260,12 @@ public class AdminCommands extends Thread
final PlayerInstance activeChar = client.getActiveChar();
final int skillid = Integer.parseInt(val);
final Skill skill = SkillTable.getInstance().getInfo(skillid, 1);
- if (skill != null)
+ if ((skill != null) && (skill.getTargetType() == 0))
{
- if (skill.getTargetType() == 0)
- {
- activeChar.setTarget(activeChar);
- final MagicSkillUser msk = new MagicSkillUser(activeChar, skillid, 1, skill.getHitTime(), skill.getReuseDelay());
- activeChar.sendPacket(msk);
- activeChar.broadcastPacket(msk);
- // ActionFailed af = new ActionFailed();
- }
- // else if (skill.getTargetType() == 1)
- // {
- // ActionFailed af = new ActionFailed();
- // }
+ activeChar.setTarget(activeChar);
+ final MagicSkillUser msk = new MagicSkillUser(activeChar, skillid, 1, skill.getHitTime(), skill.getReuseDelay());
+ activeChar.sendPacket(msk);
+ activeChar.broadcastPacket(msk);
}
- // else
- // {
- // ActionFailed af = new ActionFailed();
- // }
}
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Announcements.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Announcements.java
index 842130a9ce..69c529694a 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Announcements.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/Announcements.java
@@ -71,7 +71,7 @@ public class Announcements
{
for (int i = 0; i < _announcements.size(); ++i)
{
- final CreatureSay cs = new CreatureSay(0, 10, activeChar.getName(), _announcements.get(i).toString());
+ final CreatureSay cs = new CreatureSay(0, 10, activeChar.getName(), _announcements.get(i));
activeChar.sendPacket(cs);
}
}
@@ -79,11 +79,11 @@ public class Announcements
public void listAnnouncements(PlayerInstance activeChar)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
- final StringBuffer replyMSG = new StringBuffer("
Announcements:");
+ final StringBuilder replyMSG = new StringBuilder("Announcements:");
replyMSG.append("");
for (int i = 0; i < _announcements.size(); ++i)
{
- replyMSG.append(_announcements.get(i).toString());
+ replyMSG.append(_announcements.get(i));
replyMSG.append("
");
}
replyMSG.append(" ");
@@ -149,7 +149,7 @@ public class Announcements
final FileWriter save = new FileWriter(new File("data/announcements.txt"));
for (int i = 0; i < _announcements.size(); ++i)
{
- save.write(_announcements.get(i).toString());
+ save.write(_announcements.get(i));
save.write("\r\n");
}
save.close();
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameServer.java
index cbe87744a4..5ddb8131b6 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameServer.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameServer.java
@@ -130,9 +130,9 @@ public class GameServer extends Thread
if (!Config.SERVER_HOST_NAME.equals("*"))
{
final InetAddress adr = InetAddress.getByName(Config.SERVER_HOST_NAME);
- Config._ip = adr.getHostAddress();
+ String ip = adr.getHostAddress();
_serverSocket = new ServerSocket(Config.SERVER_PORT, 50, adr);
- _log.config("GameServer listening on IP:" + Config._ip + " Port " + Config.SERVER_PORT);
+ _log.config("GameServer listening on IP:" + ip + " Port " + Config.SERVER_PORT);
}
else
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameTimeController.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameTimeController.java
index a195b599fd..70bf9267b2 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameTimeController.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/GameTimeController.java
@@ -66,7 +66,6 @@ public class GameTimeController extends Thread
}
catch (InterruptedException e1)
{
- return;
}
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/CharNameTable.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/CharNameTable.java
index c89d554a94..6f2cfcfa70 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/CharNameTable.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/CharNameTable.java
@@ -38,21 +38,20 @@ public class CharNameTable
private CharNameTable()
{
- final File _accountsFolder = new File("data/accounts");
- _accountsFolder.mkdirs();
+ final File accountsFolder = new File("data/accounts");
+ accountsFolder.mkdirs();
_charNames = new ArrayList<>();
- final File[] accounts = _accountsFolder.listFiles();
+ final File[] accounts = accountsFolder.listFiles();
for (File account : accounts)
{
try
{
- final File _charFolder = new File("data/accounts/" + account.getName());
- final File[] chars = _charFolder.listFiles((FilenameFilter) (dir, name) -> name.endsWith("_char.csv"));
+ final File charFolder = new File("data/accounts/" + account.getName());
+ final File[] chars = charFolder.listFiles((FilenameFilter) (dir, name) -> name.endsWith("_char.csv"));
for (File c : chars)
{
_charNames.add(c.getName().replaceAll("_char.csv", "").toLowerCase());
}
- continue;
}
catch (NullPointerException e)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java
index 7cc5fd345e..cc7eb39032 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java
@@ -186,9 +186,9 @@ public class ItemTable
private void fixEtcItems(HashMap items)
{
- for (int key : items.keySet())
+ for (Item i : items.values())
{
- final EtcItem item = (EtcItem) items.get(key);
+ final EtcItem item = (EtcItem) i;
if ((item.getWeight() == 0) && (item.getEtcItemType() != EtcItem.TYPE_MONEY) && !item.getName().startsWith("world_map") && !item.getName().startsWith("crystal_"))
{
item.setType2(Item.TYPE2_QUEST);
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/SpawnTable.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/SpawnTable.java
index 49a452ea38..5ab835635f 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/SpawnTable.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/SpawnTable.java
@@ -87,7 +87,7 @@ public class SpawnTable
}
}
- private Spawn parseList(String line) throws SecurityException, ClassNotFoundException
+ private Spawn parseList(String line) throws ClassNotFoundException
{
final StringTokenizer st = new StringTokenizer(line, ";");
final int spawnId = Integer.parseInt(st.nextToken());
@@ -115,9 +115,9 @@ public class SpawnTable
return spawnDat;
}
- public Spawn getTemplate(int Id)
+ public Spawn getTemplate(int id)
{
- return _spawntable.get(Id);
+ return _spawntable.get(id);
}
public void addNewSpawn(Spawn spawn)
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java
index 90a217953e..ef32deb360 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java
@@ -43,27 +43,27 @@ public class Potions implements IItemHandler
@Override
public int useItem(PlayerInstance activeChar, ItemInstance item)
{
- final Potion Potion = new Potion();
+ final Potion potion = new Potion();
final int itemId = item.getItemId();
if ((itemId == 65) || (itemId == 725) || (itemId == 727) || (itemId == 1060) || (itemId == 1061) || (itemId == 1539) || (itemId == 1540) || (itemId == 1073))
{
- final WorldObject OldTarget = activeChar.getTarget();
+ final WorldObject oldTarget = activeChar.getTarget();
activeChar.setTarget(activeChar);
- final MagicSkillUser MSU = new MagicSkillUser(activeChar, 2038, 1, 0, 0);
- activeChar.sendPacket(MSU);
- activeChar.broadcastPacket(MSU);
- activeChar.setTarget(OldTarget);
- Potion.setCurrentHpPotion1(activeChar, itemId);
+ final MagicSkillUser msu = new MagicSkillUser(activeChar, 2038, 1, 0, 0);
+ activeChar.sendPacket(msu);
+ activeChar.broadcastPacket(msu);
+ activeChar.setTarget(oldTarget);
+ potion.setCurrentHpPotion1(activeChar, itemId);
}
else if ((itemId == 726) || (itemId == 728))
{
- final WorldObject OldTarget = activeChar.getTarget();
+ final WorldObject oldTarget = activeChar.getTarget();
activeChar.setTarget(activeChar);
- final MagicSkillUser MSU = new MagicSkillUser(activeChar, 2038, 1, 0, 0);
- activeChar.sendPacket(MSU);
- activeChar.broadcastPacket(MSU);
- activeChar.setTarget(OldTarget);
- Potion.setCurrentMpPotion1(activeChar, itemId);
+ final MagicSkillUser msu = new MagicSkillUser(activeChar, 2038, 1, 0, 0);
+ activeChar.sendPacket(msu);
+ activeChar.broadcastPacket(msu);
+ activeChar.setTarget(oldTarget);
+ potion.setCurrentMpPotion1(activeChar, itemId);
}
return 1;
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java
index df1ef20435..4933f33b07 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulShots.java
@@ -72,12 +72,12 @@ public class SoulShots implements IItemHandler
}
activeChar.setActiveSoulshotGrade(grade);
activeChar.sendPacket(new SystemMessage(SystemMessage.ENABLED_SOULSHOT));
- final WorldObject OldTarget = activeChar.getTarget();
+ final WorldObject oldTarget = activeChar.getTarget();
activeChar.setTarget(activeChar);
- final MagicSkillUser MSU = new MagicSkillUser(activeChar, 2039, 1, 0, 0);
- activeChar.sendPacket(MSU);
- activeChar.broadcastPacket(MSU);
- activeChar.setTarget(OldTarget);
+ final MagicSkillUser msu = new MagicSkillUser(activeChar, 2039, 1, 0, 0);
+ activeChar.sendPacket(msu);
+ activeChar.broadcastPacket(msu);
+ activeChar.setTarget(oldTarget);
return soulShotConsumption;
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/CommunityBoardManager.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/CommunityBoardManager.java
index 6249339707..1389a9ef77 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/CommunityBoardManager.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/CommunityBoardManager.java
@@ -52,7 +52,7 @@ public class CommunityBoardManager
final PlayerInstance activeChar = client.getActiveChar();
if (command.startsWith("bbs_"))
{
- final StringBuffer htmlCode = new StringBuffer("
Community Board
");
+ final StringBuilder htmlCode = new StringBuilder("
Community Board
");
if (command.equals("bbs_default"))
{
final Collection players = World.getInstance().getAllPlayers();
@@ -122,7 +122,7 @@ public class CommunityBoardManager
htmlCode.append("
");
for (ClanMember member : clan.getMembers())
{
- if (member.getName() == clan.getLeaderName())
+ if (member.getName().equals(clan.getLeaderName()))
{
continue;
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Skill.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Skill.java
index 31660430a4..ee70be17c4 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Skill.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Skill.java
@@ -19,17 +19,18 @@ package org.l2jmobius.gameserver.model;
public class Skill
{
- public static int OP_ALWAYS = 1;
- public static int OP_ONCE = 2;
- public static int OP_DURATION = 3;
- public static int OP_TOGGLE = 4;
- public static int TARGET_SELF = 0;
- public static int TARGET_ONE = 1;
- public static int TARGET_PARTY = 2;
- public static int TARGET_CLAN = 3;
- public static int TARGET_PET = 4;
- public static int TARGET_ENEMY = 5;
- public static int TARGET_FRIEND = 6;
+ public static final int OP_ALWAYS = 1;
+ public static final int OP_ONCE = 2;
+ public static final int OP_DURATION = 3;
+ public static final int OP_TOGGLE = 4;
+ public static final int TARGET_SELF = 0;
+ public static final int TARGET_ONE = 1;
+ public static final int TARGET_PARTY = 2;
+ public static final int TARGET_CLAN = 3;
+ public static final int TARGET_PET = 4;
+ public static final int TARGET_ENEMY = 5;
+ public static final int TARGET_FRIEND = 6;
+
private int _id;
private int _level;
private String _name;
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Spawn.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Spawn.java
index fbbce99b57..49424b80ba 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Spawn.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Spawn.java
@@ -46,7 +46,7 @@ public class Spawn
private int _respawnDelay;
private final Constructor _constructor;
- public Spawn(Npc mobTemplate) throws SecurityException, ClassNotFoundException
+ public Spawn(Npc mobTemplate) throws ClassNotFoundException
{
_template = mobTemplate;
final String implementationName = _template.getType();
@@ -182,14 +182,7 @@ public class Spawn
};
mob = (NpcInstance) _constructor.newInstance(parameters);
mob.setObjectId(IdFactory.getInstance().getNextId());
- if (mob instanceof MonsterInstance)
- {
- mob.setAutoAttackable(true);
- }
- else
- {
- mob.setAutoAttackable(false);
- }
+ mob.setAutoAttackable(mob instanceof MonsterInstance);
if (getRandomx() > 0)
{
final int random1 = Rnd.get(getRandomx());
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/TradeList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/TradeList.java
index 157ad4fed0..06d944c9d3 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/TradeList.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/TradeList.java
@@ -89,12 +89,12 @@ public class TradeList
return -1;
}
- public ItemInstance getItem(int ObjectId)
+ public ItemInstance getItem(int objectId)
{
for (int i = 0; i < _items.size(); ++i)
{
final ItemInstance item = _items.get(i);
- if (item.getObjectId() != ObjectId)
+ if (item.getObjectId() != objectId)
{
continue;
}
@@ -280,12 +280,12 @@ public class TradeList
}
else
{
- msg = new SystemMessage(SystemMessage.S1_PURCHASED_S3_S2_s);
+ msg = new SystemMessage(SystemMessage.S1_PURCHASED_S3_S2_S);
msg.addString(buyer.getName());
msg.addItemName(((ItemInstance) sellerItem).getItemId());
msg.addNumber(amount);
sysmsgs.add(msg);
- msg = new SystemMessage(SystemMessage.S1_PURCHASED_S3_S2_s);
+ msg = new SystemMessage(SystemMessage.S1_PURCHASED_S3_S2_S);
msg.addString("You");
msg.addItemName(((ItemInstance) sellerItem).getItemId());
msg.addNumber(amount);
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java
index db4e362d37..a1f833a797 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java
@@ -115,11 +115,10 @@ public class World
public void removeVisibleObject(WorldObject object)
{
_visibleObjects.remove(object.getObjectId());
- for (Object element : object.getKnownObjects())
+ for (WorldObject wo : object.getKnownObjects())
{
- final WorldObject temp1 = (WorldObject) element;
- temp1.removeKnownObject(object);
- object.removeKnownObject(temp1);
+ wo.removeKnownObject(object);
+ object.removeKnownObject(wo);
}
if (object instanceof PlayerInstance)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java
index f9c7eea948..8b3ba71d6d 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java
@@ -31,7 +31,7 @@ public class WorldObject implements Serializable
private int _x;
private int _y;
private int _z;
- protected Set _knownObjects = ConcurrentHashMap.newKeySet();
+ protected final Set _knownObjects = ConcurrentHashMap.newKeySet();
private final Set _knownPlayers = ConcurrentHashMap.newKeySet();
public int getObjectId()
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java
index 9d45474d05..168c133392 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java
@@ -110,24 +110,6 @@ public class Attackable extends NpcInstance
super.startAttack(target);
}
- @Override
- public void setX(int x)
- {
- super.setX(x);
- }
-
- @Override
- public void setY(int y)
- {
- super.setY(y);
- }
-
- @Override
- public void setZ(int z)
- {
- super.setZ(z);
- }
-
@Override
public void removeKnownObject(WorldObject object)
{
@@ -153,8 +135,8 @@ public class Attackable extends NpcInstance
}
else if (isDead())
{
- final Attackable Attackable = this;
- synchronized (Attackable)
+ final Attackable attackable = this;
+ synchronized (attackable)
{
if (!_killedAlready)
{
@@ -263,14 +245,7 @@ public class Attackable extends NpcInstance
newAggro += aggroValue.intValue();
}
_aggroList.put(attacker, newAggro);
- if (_aggroList.size() == 1)
- {
- setTarget(attacker);
- }
- else
- {
- setTarget(attacker);
- }
+ setTarget(attacker);
}
public void doItemDrop()
@@ -298,12 +273,11 @@ public class Attackable extends NpcInstance
dropit.setZ(getZ() + 100);
dropit.setOnTheGround(true);
final DropItem dis = new DropItem(dropit, getObjectId());
- for (Creature player : broadcastPacket(dis))
+ for (PlayerInstance player : broadcastPacket(dis))
{
- ((PlayerInstance) player).addKnownObjectWithoutCreate(dropit);
+ player.addKnownObjectWithoutCreate(dropit);
}
World.getInstance().addVisibleObject(dropit);
- continue;
}
}
}
@@ -331,12 +305,6 @@ public class Attackable extends NpcInstance
}
}
- @Override
- public void setCurrentHp(double currentHp)
- {
- super.setCurrentHp(currentHp);
- }
-
@Override
public Weapon getActiveWeapon()
{
@@ -409,7 +377,7 @@ public class Attackable extends NpcInstance
{
for (PlayerInstance player : getKnownPlayers())
{
- if (!getCondition2(player) || !(getDistance(player.getX(), player.getY()) <= (getCollisionRadius() + 200.0)))
+ if (!getCondition2(player) || (getDistance(player.getX(), player.getY()) > (getCollisionRadius() + 200.0)))
{
continue;
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
index 39474e9bc3..ee46d2b96d 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java
@@ -407,7 +407,6 @@ public abstract class Creature extends WorldObject
try
{
player.sendPacket(su);
- continue;
}
catch (Exception e1)
{
@@ -879,7 +878,6 @@ public abstract class Creature extends WorldObject
{
sendPacket(new ActionFailed());
onTargetReached();
- return;
}
}
@@ -1519,10 +1517,7 @@ public abstract class Creature extends WorldObject
setX(x);
setY(y);
setZ(z);
- ThreadPool.schedule(() ->
- {
- World.getInstance().addVisibleObject(this);
- }, 2000);
+ ThreadPool.schedule(() -> World.getInstance().addVisibleObject(this), 2000);
}
@Override
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java
index f2a1b38c74..1328a0e5ef 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/MerchantInstance.java
@@ -35,12 +35,6 @@ public class MerchantInstance extends NpcInstance
super(template);
}
- @Override
- public void onAction(PlayerInstance player)
- {
- super.onAction(player);
- }
-
@Override
public String getHtmlPath(int npcId, int val)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
index 405a304e79..77a7791a67 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model.actor.instance;
import java.io.File;
import java.io.FileInputStream;
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger;
@@ -58,6 +59,9 @@ public class NpcInstance extends Creature
_npcTemplate = template;
setCollisionHeight(template.getHeight());
setCollisionRadius(template.getRadius());
+ // TODO: Datapack support for name and title.
+ // setName(template.getName());
+ // setTitle(template.getTitle());
}
public boolean isAggressive()
@@ -171,7 +175,7 @@ public class NpcInstance extends Creature
if (client.getAccessLevel() >= 100)
{
final NpcHtmlMessage html = new NpcHtmlMessage(1);
- final StringBuffer html1 = new StringBuffer("
");
+ final StringBuilder html1 = new StringBuilder("
");
html1.append("
Current Target:
");
html1.append("
");
html1.append("
Object ID: " + getObjectId() + "
");
@@ -219,7 +223,7 @@ public class NpcInstance extends Creature
public void insertObjectIdAndShowChatWindow(PlayerInstance player, String content)
{
- content = content.replaceAll("%objectId%", String.valueOf(getObjectId()));
+ content = content.replace("%objectId%", String.valueOf(getObjectId()));
final NpcHtmlMessage npcReply = new NpcHtmlMessage(5);
npcReply.setHtml(content);
player.sendPacket(npcReply);
@@ -265,7 +269,7 @@ public class NpcInstance extends Creature
FileInputStream fis = new FileInputStream(file);
final byte[] raw = new byte[fis.available()];
fis.read(raw);
- final String content = new String(raw, "UTF-8");
+ final String content = new String(raw, StandardCharsets.UTF_8);
insertObjectIdAndShowChatWindow(player, content);
fis.close();
}
@@ -314,8 +318,7 @@ public class NpcInstance extends Creature
super.reduceCurrentHp(i, attacker);
if (isDead())
{
- final NpcInstance NpcInstance = this;
- synchronized (NpcInstance)
+ synchronized (this)
{
if ((_decayTask == null) || _decayTask.isCancelled() || _decayTask.isDone())
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
index 32c626107d..9e93747d30 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java
@@ -353,8 +353,7 @@ public class PetInstance extends Creature
}
final ItemInstance target = (ItemInstance) getTarget();
boolean pickupOk = false;
- final ItemInstance ItemInstance = target;
- synchronized (ItemInstance)
+ synchronized (target)
{
if (target.isOnTheGround())
{
@@ -387,21 +386,13 @@ public class PetInstance extends Creature
public void reduceCurrentHp(int damage, Creature attacker)
{
super.reduceCurrentHp(damage, attacker);
- if (!isDead() && (attacker != null))
+ if (!isDead() && (attacker != null) && !isInCombat())
{
- if (!isInCombat())
- {
- startAttack(attacker);
- }
- // else
- // {
- // _log.fine("already attacking");
- // }
+ startAttack(attacker);
}
if (isDead())
{
- final PetInstance PetInstance = this;
- synchronized (PetInstance)
+ synchronized (this)
{
if ((_decayTask == null) || _decayTask.isCancelled() || _decayTask.isDone())
{
@@ -445,10 +436,10 @@ public class PetInstance extends Creature
_owner.getInventory().addItem(item);
getInventory().dropItem(item, item.getCount());
final PetInventoryUpdate petiu = new PetInventoryUpdate();
- final ItemList PlayerUI = new ItemList(_owner, false);
+ final ItemList playerUI = new ItemList(_owner, false);
petiu.addRemovedItem(item);
_owner.sendPacket(petiu);
- _owner.sendPacket(PlayerUI);
+ _owner.sendPacket(playerUI);
}
catch (Exception e)
{
@@ -531,9 +522,9 @@ public class PetInstance extends Creature
dropit.setZ(getZ() + 100);
dropit.setOnTheGround(true);
final DropItem dis = new DropItem(dropit, getObjectId());
- for (Creature player : broadcastPacket(dis))
+ for (PlayerInstance player : broadcastPacket(dis))
{
- ((PlayerInstance) player).addKnownObjectWithoutCreate(dropit);
+ player.addKnownObjectWithoutCreate(dropit);
}
World.getInstance().addVisibleObject(dropit);
}
@@ -586,11 +577,11 @@ public class PetInstance extends Creature
updateKnownCounter = (byte) (updateKnownCounter + 1);
if (updateKnownCounter > 3)
{
- if (getKnownObjects().size() != 0)
+ if (!getKnownObjects().isEmpty())
{
for (WorldObject object : _knownObjects)
{
- if (!(getDistance(object.getX(), object.getY()) > 4000.0))
+ if (getDistance(object.getX(), object.getY()) <= 4000.0)
{
continue;
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 45a90eeb3a..61cdf51c73 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -138,8 +138,7 @@ public class PlayerInstance extends Creature
public Skill addSkill(Skill newSkill)
{
- final Skill oldSkill = _skills.put(newSkill.getId(), newSkill);
- return oldSkill;
+ return _skills.put(newSkill.getId(), newSkill);
}
public Skill removeSkill(Skill skill)
@@ -720,6 +719,7 @@ public class PlayerInstance extends Creature
case CASTING:
{
useMagic(_skill);
+ break; // Use a fallthrou?
}
case INTERACT:
{
@@ -765,8 +765,7 @@ public class PlayerInstance extends Creature
final StopMove sm = new StopMove(getObjectId(), getX(), getY(), getZ(), getHeading());
sendPacket(sm);
boolean pickupOk = false;
- final ItemInstance ItemInstance = target;
- synchronized (ItemInstance)
+ synchronized (target)
{
if (target.isOnTheGround())
{
@@ -844,7 +843,7 @@ public class PlayerInstance extends Creature
((Creature) oldTarget).removeStatusListener(this);
}
}
- if ((newTarget != null) && (newTarget instanceof Creature))
+ if (newTarget instanceof Creature)
{
((Creature) newTarget).addStatusListener(this);
}
@@ -1366,10 +1365,10 @@ public class PlayerInstance extends Creature
Armor armorPiece;
final double lvlBonus = (89.0 + getLevel()) / 100.0;
final StatModifiers modifier = CharStatsTable.getInstance().getTemplate(getClassId());
- double MENbonus = 1.0;
+ double menBonus = 1.0;
if (modifier != null)
{
- MENbonus = (100.0 + modifier.getModmen()) / 100.0;
+ menBonus = (100.0 + modifier.getModmen()) / 100.0;
}
else
{
@@ -1411,7 +1410,7 @@ public class PlayerInstance extends Creature
armorPiece = (Armor) dummy.getItem();
totalItemDef += armorPiece.getMDef();
}
- final double mDef = totalItemDef * lvlBonus * MENbonus;
+ final double mDef = totalItemDef * lvlBonus * menBonus;
setMagicalDefense((int) Math.round(mDef));
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java
index ff75fbd1d6..2e94a9ea51 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java
@@ -53,12 +53,6 @@ public class TeleporterInstance extends NpcInstance
return "data/html/teleporter/" + pom + ".htm";
}
- @Override
- public void onAction(PlayerInstance player)
- {
- super.onAction(player);
- }
-
private void doTeleport(PlayerInstance player, int val)
{
final TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(val);
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TrainerInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TrainerInstance.java
index 41fbf5b9bf..528359d842 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TrainerInstance.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TrainerInstance.java
@@ -30,12 +30,6 @@ public class TrainerInstance extends NpcInstance
super(template);
}
- @Override
- public void onAction(PlayerInstance player)
- {
- super.onAction(player);
- }
-
@Override
public String getHtmlPath(int npcId, int val)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
index 29c791f18c..17cffaa828 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
@@ -50,12 +50,6 @@ public class VillageMasterInstance extends NpcInstance
return "data/html/villagemaster/" + pom + ".htm";
}
- @Override
- public void onAction(PlayerInstance player)
- {
- super.onAction(player);
- }
-
public void createClan(PlayerInstance player, String clanName)
{
if (player.getLevel() < 10)
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/WarehouseInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/WarehouseInstance.java
index a657b00794..102b35119f 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/WarehouseInstance.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/WarehouseInstance.java
@@ -35,12 +35,6 @@ public class WarehouseInstance extends NpcInstance
super(template);
}
- @Override
- public void onAction(PlayerInstance player)
- {
- super.onAction(player);
- }
-
@Override
public String getHtmlPath(int npcId, int val)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java
index d7f8b80125..29f9069fbd 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java
@@ -284,7 +284,7 @@ public class ClientThread extends Thread
}
else
{
- _log.warning("could not restore " + chars[charslot]);
+ _log.warning("Could not restore " + chars[charslot]);
}
return character;
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Connection.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Connection.java
index f5f8fb3852..0c03e8fdd3 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Connection.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/Connection.java
@@ -124,7 +124,7 @@ public class Connection
int a;
int charpoint;
byte t1;
- final StringBuffer result = new StringBuffer();
+ final StringBuilder result = new StringBuilder();
int counter = 0;
for (int i = 0; i < len; ++i)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java
index 46707a2ff6..12408b05f9 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/PacketHandler.java
@@ -544,7 +544,7 @@ public class PacketHandler
int a;
int charpoint;
byte t1;
- final StringBuffer result = new StringBuffer();
+ final StringBuilder result = new StringBuilder();
int counter = 0;
for (int i = 0; i < len; ++i)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
index 5ffe072c74..60d742bda5 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AddTradeItem.java
@@ -42,7 +42,7 @@ public class AddTradeItem extends ClientBasePacket
final TradeList playerItemList = player.getTradeList();
player.getTradeList().setConfirmedTrade(false);
requestor.getTradeList().setConfirmedTrade(false);
- if (playerItemList.getItems().size() > 0)
+ if (!playerItemList.getItems().isEmpty())
{
if (!playerItemList.contains(objectId))
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
index 9639fe07bc..91d79d9c20 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
@@ -27,7 +27,7 @@ import org.l2jmobius.loginserver.LoginController;
public class AuthLogin extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(AuthLogin.class.getName());
+ private static final Logger _log = Logger.getLogger(AuthLogin.class.getName());
public AuthLogin(byte[] decrypt, ClientThread client) throws IOException
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
index 6a609b1c1a..cbff0aa7bd 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
@@ -17,7 +17,6 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
-import java.io.FileNotFoundException;
import java.io.IOException;
import org.l2jmobius.gameserver.IdFactory;
@@ -91,7 +90,7 @@ public class CharacterCreate extends ClientBasePacket
return result;
}
- private void initNewChar(ClientThread client, PlayerInstance newChar) throws FileNotFoundException, IOException
+ private void initNewChar(ClientThread client, PlayerInstance newChar) throws IOException
{
newChar.setObjectId(IdFactory.getInstance().getNextId());
World.getInstance().storeObject(newChar);
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ClientBasePacket.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ClientBasePacket.java
index ab51dd634f..960c58030f 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ClientBasePacket.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ClientBasePacket.java
@@ -17,6 +17,8 @@
*/
package org.l2jmobius.gameserver.network.clientpackets;
+import java.nio.charset.StandardCharsets;
+
public abstract class ClientBasePacket
{
private final byte[] _decrypt;
@@ -65,7 +67,7 @@ public abstract class ClientBasePacket
String result = null;
try
{
- result = new String(_decrypt, _off, _decrypt.length - _off, "UTF-16LE");
+ result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE);
result = result.substring(0, result.indexOf(0));
}
catch (Exception e)
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 8f26650edc..d89ef8ad31 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class EnterWorld extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(EnterWorld.class.getName());
+ private static final Logger _log = Logger.getLogger(EnterWorld.class.getName());
public EnterWorld(byte[] decrypt, ClientThread client)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java
index cd9fbe721b..ab11d26012 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/ProtocolVersion.java
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.network.serverpackets.KeyPacket;
public class ProtocolVersion extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(ProtocolVersion.class.getName());
+ private static final Logger _log = Logger.getLogger(ProtocolVersion.class.getName());
public ProtocolVersion(byte[] rawPacket, ClientThread client) throws IOException
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
index 0c84df37ba..a0412a998e 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
@@ -30,7 +30,7 @@ import org.l2jmobius.gameserver.network.serverpackets.StopMove;
public class RequestActionUse extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(RequestActionUse.class.getName());
+ private static final Logger _log = Logger.getLogger(RequestActionUse.class.getName());
public RequestActionUse(byte[] rawPacket, ClientThread client)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
index b6813ae8eb..17fd510248 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.AllyCrest;
public class RequestAllyCrest extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(RequestAllyCrest.class.getName());
+ private static final Logger _log = Logger.getLogger(RequestAllyCrest.class.getName());
public RequestAllyCrest(byte[] rawPacket, ClientThread client) throws IOException
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
index 2c261ac7ea..63eb62ed07 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBuyItem.java
@@ -33,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class RequestBuyItem extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(RequestBuyItem.class.getName());
+ private static final Logger _log = Logger.getLogger(RequestBuyItem.class.getName());
public RequestBuyItem(byte[] decrypt, ClientThread client)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
index e5961302f5..50fbf0a19b 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.network.ClientThread;
public class RequestBypassToServer extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(RequestBypassToServer.class.getName());
+ private static final Logger _log = Logger.getLogger(RequestBypassToServer.class.getName());
public RequestBypassToServer(byte[] decrypt, ClientThread client)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
index b7b25e2ec2..4c73e12f03 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java
@@ -20,7 +20,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
import java.util.logging.Logger;
import org.l2jmobius.gameserver.model.World;
-import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.ItemInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.ClientThread;
@@ -31,7 +30,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class RequestDropItem extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(RequestDropItem.class.getName());
+ private static final Logger _log = Logger.getLogger(RequestDropItem.class.getName());
public RequestDropItem(byte[] decrypt, ClientThread client)
{
@@ -87,9 +86,9 @@ public class RequestDropItem extends ClientBasePacket
final DropItem di = new DropItem(dropedItem, activeChar.getObjectId());
activeChar.sendPacket(di);
activeChar.addKnownObjectWithoutCreate(dropedItem);
- for (Creature player : activeChar.broadcastPacket(di))
+ for (PlayerInstance player : activeChar.broadcastPacket(di))
{
- ((PlayerInstance) player).addKnownObjectWithoutCreate(dropedItem);
+ player.addKnownObjectWithoutCreate(dropedItem);
}
final InventoryUpdate iu = new InventoryUpdate();
if (oldCount == dropedItem.getCount())
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java
index f4c4b12fbb..695f05fef2 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestGetItemFromPet.java
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PetInventoryUpdate;
public class RequestGetItemFromPet extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(RequestGetItemFromPet.class.getName());
+ private static final Logger _log = Logger.getLogger(RequestGetItemFromPet.class.getName());
public RequestGetItemFromPet(byte[] decrypt, ClientThread client)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
index 6a053ddfb4..4088a957a8 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestJoinParty.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class RequestJoinParty extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(RequestJoinParty.class.getName());
+ private static final Logger _log = Logger.getLogger(RequestJoinParty.class.getName());
public RequestJoinParty(byte[] decrypt, ClientThread client)
{
@@ -120,9 +120,5 @@ public class RequestJoinParty extends ClientBasePacket
_log.warning(requestor.getName() + " already received a party invitation");
}
}
- else if (target.getKnownPlayers().contains(requestor))
- {
- _log.warning(client.getActiveChar().getName() + " invited someone who doesn't know him.");
- }
}
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
index a04f4bbca0..d31038f017 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.network.ClientThread;
public class RequestMagicSkillUse extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(RequestMagicSkillUse.class.getName());
+ private static final Logger _log = Logger.getLogger(RequestMagicSkillUse.class.getName());
public RequestMagicSkillUse(byte[] rawPacket, ClientThread client)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
index 2b3c0218e9..d707bf1782 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class RequestOustPledgeMember extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(RequestOustPledgeMember.class.getName());
+ private static final Logger _log = Logger.getLogger(RequestOustPledgeMember.class.getName());
public RequestOustPledgeMember(byte[] rawPacket, ClientThread client)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
index 94d78a8187..25cbb26421 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeCrest;
public class RequestPledgeCrest extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(RequestPledgeCrest.class.getName());
+ private static final Logger _log = Logger.getLogger(RequestPledgeCrest.class.getName());
public RequestPledgeCrest(byte[] rawPacket, ClientThread client) throws IOException
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
index 365cf584be..50f7cab143 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListAll;
public class RequestPledgeInfo extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(RequestPledgeInfo.class.getName());
+ private static final Logger _log = Logger.getLogger(RequestPledgeInfo.class.getName());
public RequestPledgeInfo(byte[] rawPacket, ClientThread client)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
index a5a51b893b..05424a02c3 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -50,7 +50,7 @@ public class RequestUnEquipItem extends ClientBasePacket
activeChar.setAttackStatus(false);
final CharInfo info = new CharInfo(activeChar);
activeChar.broadcastPacket(info);
- if (unequiped.size() > 0)
+ if (!unequiped.isEmpty())
{
final SystemMessage sm = new SystemMessage(SystemMessage.S1_DISARMED);
sm.addItemName(unequiped.stream().findFirst().get().getItemId());
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyBuyList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyBuyList.java
index 35804866f8..7d3e94e73e 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyBuyList.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyBuyList.java
@@ -55,7 +55,7 @@ public class SendPrivateStoreBuyBuyList extends ClientBasePacket
{
buyer.getTradeList().BuySellItems(buyer, buyerlist, seller, sellerlist);
buyer.getTradeList().updateBuyList(buyer, buyerlist);
- if (buyer.getBuyList().size() == 0)
+ if (buyer.getBuyList().isEmpty())
{
buyer.setPrivateStoreType(0);
buyer.sendPacket(new ChangeWaitType(buyer, 1));
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java
index a00cbf464e..04287f60b2 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/SendPrivateStoreBuyList.java
@@ -54,7 +54,7 @@ public class SendPrivateStoreBuyList extends ClientBasePacket
if ((buyer.getAdena() >= cost) && (count > 0) && (seller.getPrivateStoreType() == 1))
{
seller.getTradeList().BuySellItems(buyer, buyerlist, seller, sellerlist);
- if (seller.getSellList().size() == 0)
+ if (seller.getSellList().isEmpty())
{
seller.setPrivateStoreType(0);
seller.sendPacket(new ChangeWaitType(seller, 1));
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
index 64529a421c..647b43b251 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/TradeRequest.java
@@ -28,7 +28,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
public class TradeRequest extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(TradeRequest.class.getName());
+ private static final Logger _log = Logger.getLogger(TradeRequest.class.getName());
public TradeRequest(byte[] decrypt, ClientThread client)
{
@@ -37,7 +37,7 @@ public class TradeRequest extends ClientBasePacket
final PlayerInstance player = client.getActiveChar();
final World world = World.getInstance();
final WorldObject target = world.findObject(objectId);
- if ((target == null) || !(target instanceof PlayerInstance) || (target.getObjectId() != objectId))
+ if (!(target instanceof PlayerInstance) || (target.getObjectId() != objectId))
{
player.sendPacket(new SystemMessage(SystemMessage.TARGET_IS_INCORRECT));
return;
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
index ec0b362fa1..a81e73628d 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
public class UseItem extends ClientBasePacket
{
- final static Logger _log = Logger.getLogger(UseItem.class.getName());
+ private static final Logger _log = Logger.getLogger(UseItem.class.getName());
public UseItem(byte[] decrypt, ClientThread client)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AuthLoginFail.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AuthLoginFail.java
index 48f51a1058..c79b810072 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AuthLoginFail.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AuthLoginFail.java
@@ -19,17 +19,18 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class AuthLoginFail extends ServerBasePacket
{
- public static int NO_TEXT = 0;
- public static int SYSTEM_ERROR_LOGIN_LATER = 1;
- public static int PASSWORD_DOES_NOT_MATCH_THIS_ACCOUNT = 2;
- public static int PASSWORD_DOES_NOT_MATCH_THIS_ACCOUNT2 = 3;
- public static int ACCESS_FAILED_TRY_LATER = 4;
- public static int INCORRECT_ACCOUNT_INFO_CONTACT_CUSTOMER_SUPPORT = 5;
- public static int ACCESS_FAILED_TRY_LATER2 = 6;
- public static int ACOUNT_ALREADY_IN_USE = 7;
- public static int ACCESS_FAILED_TRY_LATER3 = 8;
- public static int ACCESS_FAILED_TRY_LATER4 = 9;
- public static int ACCESS_FAILED_TRY_LATER5 = 10;
+ public static final int NO_TEXT = 0;
+ public static final int SYSTEM_ERROR_LOGIN_LATER = 1;
+ public static final int PASSWORD_DOES_NOT_MATCH_THIS_ACCOUNT = 2;
+ public static final int PASSWORD_DOES_NOT_MATCH_THIS_ACCOUNT2 = 3;
+ public static final int ACCESS_FAILED_TRY_LATER = 4;
+ public static final int INCORRECT_ACCOUNT_INFO_CONTACT_CUSTOMER_SUPPORT = 5;
+ public static final int ACCESS_FAILED_TRY_LATER2 = 6;
+ public static final int ACOUNT_ALREADY_IN_USE = 7;
+ public static final int ACCESS_FAILED_TRY_LATER3 = 8;
+ public static final int ACCESS_FAILED_TRY_LATER4 = 9;
+ public static final int ACCESS_FAILED_TRY_LATER5 = 10;
+
private final int _reason;
public AuthLoginFail(int reason)
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java
index b5783d0bfd..dd25ed6849 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ChangeMoveType.java
@@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.model.actor.Creature;
public class ChangeMoveType extends ServerBasePacket
{
- public static int WALK = 0;
- public static int RUN = 1;
+ public static final int WALK = 0;
+ public static final int RUN = 1;
private final Creature _cha;
private final int _moveType;
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java
index 93e3dc934b..d042ce69e9 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharCreateFail.java
@@ -19,10 +19,10 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class CharCreateFail extends ServerBasePacket
{
- public static int REASON_CREATION_FAILED = 0;
- public static int REASON_TOO_MANY_CHARACTERS = 1;
- public static int REASON_NAME_ALREADY_EXISTS = 2;
- public static int REASON_16_ENG_CHARS = 3;
+ public static final int REASON_CREATION_FAILED = 0;
+ public static final int REASON_TOO_MANY_CHARACTERS = 1;
+ public static final int REASON_NAME_ALREADY_EXISTS = 2;
+ public static final int REASON_16_ENG_CHARS = 3;
private final int _error;
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java
index 051398c037..b073665804 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java
@@ -121,9 +121,9 @@ public class CharSelectInfo extends ServerBasePacket
public CharSelectInfoPackage[] loadCharacterSelectInfoFromDisk()
{
- final File _charFolder = new File("data/accounts", _loginName);
- _charFolder.mkdirs();
- final File[] chars = _charFolder.listFiles((FilenameFilter) (dir, name) -> name.endsWith("_char.csv"));
+ final File charFolder = new File("data/accounts", _loginName);
+ charFolder.mkdirs();
+ final File[] chars = charFolder.listFiles((FilenameFilter) (dir, name) -> name.endsWith("_char.csv"));
_charNameList = new String[chars.length];
final CharSelectInfoPackage[] characters = new CharSelectInfoPackage[chars.length];
for (int i = 0; i < chars.length; ++i)
@@ -132,12 +132,10 @@ public class CharSelectInfo extends ServerBasePacket
restoreChar(chars[i]);
if (_charInfopackage != null)
{
- restoreInventory(new File(_charFolder, _charInfopackage.getName() + "_items.csv"));
+ restoreInventory(new File(charFolder, _charInfopackage.getName() + "_items.csv"));
characters[i] = _charInfopackage;
_charNameList[i] = _charInfopackage.getName();
- continue;
}
- // _log.warning("could not restore " + chars[i]);
}
return characters;
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java
index dfc405e836..41677c7013 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/KeyPacket.java
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class KeyPacket extends ServerBasePacket
{
- final private byte[] _key;
+ private final byte[] _key;
public KeyPacket(byte[] key)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java
index b4cc1fba41..7241c087c8 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java
@@ -41,16 +41,15 @@ public class PrivateSellListBuy extends ServerBasePacket
writeD(_buyer.getAdena());
final TradeList list = new TradeList(0);
final List buyList = _buyer.getBuyList();
- int count = _buyer.getInventory().getSize();
for (ItemInstance item : _buyer.getInventory().getItems())
{
- if (item.isEquipped() || (item.getItem().getType2() == 3) || ((item.getItem().getType2() == 4) && (item.getItem().getType1() == 4)) || ((item.getItem().getType2() == 1) && (item.getItem().getType1() == 1)) || item.isEquipped())
+ if (item.isEquipped() || (item.getItem().getType2() == 3) || ((item.getItem().getType2() == 4) && (item.getItem().getType1() == 4)) || ((item.getItem().getType2() == 1) && (item.getItem().getType1() == 1)))
{
continue;
}
list.addItem(item);
}
- count = list.getItems().size();
+ int count = list.getItems().size();
writeD(count);
for (ItemInstance item : list.getItems())
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java
index e4f734c49f..776d6ae9ad 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java
@@ -41,23 +41,22 @@ public class PrivateSellListSell extends ServerBasePacket
writeD(_seller.getAdena());
final TradeList list = new TradeList(0);
final List sellList = _seller.getSellList();
- int count = _seller.getInventory().getSize();
for (ItemInstance item : _seller.getInventory().getItems())
{
- if (item.isEquipped() || (item.getItem().getType2() == 3) || ((item.getItem().getType2() == 4) && (item.getItem().getType1() == 4)) || ((item.getItem().getType2() == 1) && (item.getItem().getType1() == 1)) || item.isEquipped())
+ if (item.isEquipped() || (item.getItem().getType2() == 3) || ((item.getItem().getType2() == 4) && (item.getItem().getType1() == 4)) || ((item.getItem().getType2() == 1) && (item.getItem().getType1() == 1)))
{
continue;
}
list.addItem(item);
}
- if (sellList.size() != 0)
+ if (!sellList.isEmpty())
{
for (TradeItem tradeItem : sellList)
{
list.removeItem(tradeItem.getObjectId(), tradeItem.getCount());
}
}
- count = list.getItems().size();
+ int count = list.getItems().size();
writeD(count);
for (ItemInstance item : list.getItems())
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
index fc50db364f..45310c0fb9 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/RestartResponse.java
@@ -19,13 +19,13 @@ package org.l2jmobius.gameserver.network.serverpackets;
public class RestartResponse extends ServerBasePacket
{
- private static final String _message = "ok merong~ khaha";
+ private static final String MESSAGE = "ok merong~ khaha";
@Override
public void writeImpl()
{
writeC(0x74);
writeD(1);
- writeS(_message);
+ writeS(MESSAGE);
}
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java
index 35a0164058..ab83e412c6 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java
@@ -41,7 +41,6 @@ public class SellList extends ServerBasePacket
writeC(0x1C);
writeD(_money);
writeD(0);
- int count = _char.getInventory().getSize();
for (ItemInstance item : _char.getInventory().getItems())
{
if (item.isEquipped() || (item.getItemId() == 57) || (item.getItem().getType2() == 3))
@@ -50,8 +49,7 @@ public class SellList extends ServerBasePacket
}
_selllist.add(item);
}
- count = _selllist.size();
- writeH(count);
+ writeH(_selllist.size());
for (ItemInstance item : _selllist)
{
writeH(item.getItem().getType1());
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ServerBasePacket.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ServerBasePacket.java
index fa771ebed7..44d24d2f4b 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ServerBasePacket.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ServerBasePacket.java
@@ -18,6 +18,7 @@
package org.l2jmobius.gameserver.network.serverpackets;
import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
public abstract class ServerBasePacket
{
@@ -61,7 +62,7 @@ public abstract class ServerBasePacket
{
if (text != null)
{
- _bao.write(text.getBytes("UTF-16LE"));
+ _bao.write(text.getBytes(StandardCharsets.UTF_16LE));
}
}
catch (Exception e)
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
index ee26a249bb..44eb97305c 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
@@ -22,32 +22,32 @@ import java.util.List;
public class StatusUpdate extends ServerBasePacket
{
- public static int LEVEL = 1;
- public static int EXP = 2;
- public static int STR = 3;
- public static int DEX = 4;
- public static int CON = 5;
- public static int INT = 6;
- public static int WIT = 7;
- public static int MEN = 8;
- public static int CUR_HP = 9;
- public static int MAX_HP = 10;
- public static int CUR_MP = 11;
- public static int MAX_MP = 12;
- public static int SP = 13;
- public static int CUR_LOAD = 14;
- public static int MAX_LOAD = 15;
- public static int P_ATK = 17;
- public static int ATK_SPD = 18;
- public static int P_DEF = 19;
- public static int EVASION = 20;
- public static int ACCURACY = 21;
- public static int CRITICAL = 22;
- public static int M_ATK = 23;
- public static int CAST_SPD = 24;
- public static int M_DEF = 25;
- public static int PVP_FLAG = 26;
- public static int KARMA = 27;
+ public static final int LEVEL = 1;
+ public static final int EXP = 2;
+ public static final int STR = 3;
+ public static final int DEX = 4;
+ public static final int CON = 5;
+ public static final int INT = 6;
+ public static final int WIT = 7;
+ public static final int MEN = 8;
+ public static final int CUR_HP = 9;
+ public static final int MAX_HP = 10;
+ public static final int CUR_MP = 11;
+ public static final int MAX_MP = 12;
+ public static final int SP = 13;
+ public static final int CUR_LOAD = 14;
+ public static final int MAX_LOAD = 15;
+ public static final int P_ATK = 17;
+ public static final int ATK_SPD = 18;
+ public static final int P_DEF = 19;
+ public static final int EVASION = 20;
+ public static final int ACCURACY = 21;
+ public static final int CRITICAL = 22;
+ public static final int M_ATK = 23;
+ public static final int CAST_SPD = 24;
+ public static final int M_DEF = 25;
+ public static final int PVP_FLAG = 26;
+ public static final int KARMA = 27;
private final int _objectId;
private final List _attributes = new ArrayList<>();
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
index 85ed1776a3..242bb406ea 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
@@ -101,12 +101,12 @@ public class SystemMessage extends ServerBasePacket
public static final int ENABLED_SOULSHOT = 342;
public static final int S1_PURCHASED_S2 = 378;
public static final int S1_PURCHASED_S2_S3 = 379;
- public static final int S1_PURCHASED_S3_S2_s = 380;
+ public static final int S1_PURCHASED_S3_S2_S = 380;
public static final int S1_DISARMED = 417;
public static final int WEIGHT_LIMIT_EXCEEDED = 422;
public static final int PURCHASED_S2_FROM_S1 = 559;
public static final int PURCHASED_S2_S3_FROM_S1 = 560;
- public static final int PURCHASED_S3_S2_s_FROM_S1 = 561;
+ public static final int PURCHASED_S3_S2_S_FROM_S1 = 561;
public static final int S1_INVITED_YOU_TO_PARTY_FINDER_KEEPER = 572;
public static final int S1_INVITED_YOU_TO_PARTY_RANDOM = 573;
public static final int S1_S2 = 614;
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java
index c4e009e8cb..494a557ed3 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java
@@ -38,7 +38,6 @@ public class TradeStart extends ServerBasePacket
{
writeC(0x2E);
writeD(_me.getTransactionRequester().getObjectId());
- int count = _me.getInventory().getSize();
for (ItemInstance item : _me.getInventory().getItems())
{
if (item.isEquipped() || (item.getItem().getType2() == 3))
@@ -47,7 +46,7 @@ public class TradeStart extends ServerBasePacket
}
_tradelist.add(item);
}
- count = _tradelist.size();
+ int count = _tradelist.size();
writeH(count);
for (int i = 0; i < count; ++i)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
index 7cb042a026..18c8dcf7e9 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java
@@ -41,7 +41,6 @@ public class WareHouseDepositList extends ServerBasePacket
writeC(0x53);
writeD(_money);
final List itemlist = new ArrayList<>();
- int count = _cha.getInventory().getSize();
for (ItemInstance item : _cha.getInventory().getItems())
{
if (item.isEquipped() || (item.getItem().getType2() == 3))
@@ -50,7 +49,7 @@ public class WareHouseDepositList extends ServerBasePacket
}
itemlist.add(item);
}
- count = itemlist.size();
+ int count = itemlist.size();
writeH(count);
for (i = 0; i < count; ++i)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/templates/Npc.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/templates/Npc.java
index 9663fc9f5a..0212d42626 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/templates/Npc.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/templates/Npc.java
@@ -29,6 +29,7 @@ public class Npc
private double _radius;
private double _height;
private String _name;
+ private String _title;
private String _sex;
private int _level;
private int _attackRange;
@@ -250,6 +251,11 @@ public class Npc
_name = name;
}
+ public void setTitle(String title)
+ {
+ _title = title;
+ }
+
public void setType(String type)
{
_type = type;
@@ -275,6 +281,11 @@ public class Npc
return _name;
}
+ public String getTitle()
+ {
+ return _title;
+ }
+
public int getNpcId()
{
return _npcId;
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/threadpool/ThreadPool.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/threadpool/ThreadPool.java
index bafc6ab129..a32c625cf0 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/threadpool/ThreadPool.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/threadpool/ThreadPool.java
@@ -52,10 +52,7 @@ public class ThreadPool
INSTANT_POOL.prestartAllCoreThreads();
// Launch purge task.
- scheduleAtFixedRate(() ->
- {
- purge();
- }, 60000, 60000);
+ scheduleAtFixedRate(ThreadPool::purge, 60000, 60000);
LOGGER.info("ThreadPool: Initialized");
LOGGER.info("...scheduled pool executor with " + Config.SCHEDULED_THREAD_POOL_COUNT + " total threads.");
@@ -166,7 +163,7 @@ public class ThreadPool
}
catch (Throwable t)
{
- t.printStackTrace();
+ LOGGER.info("ThreadPool: Problem at Shutting down. " + t.getMessage());
}
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/Gui.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/Gui.java
index 08e595edd1..d928449062 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/Gui.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/Gui.java
@@ -109,7 +109,7 @@ public class Gui
final String input = ((String) answer).trim();
if (Util.isDigit(input))
{
- final int delay = Integer.valueOf(input);
+ final int delay = Integer.parseInt(input);
if (delay > 0)
{
AdminCommands.getInstance().serverShutdown(null, delay);
@@ -170,10 +170,7 @@ public class Gui
{
final JMenuItem mntmFont = new JMenuItem(font);
mntmFont.setFont(new Font("Segoe UI", Font.PLAIN, 13));
- mntmFont.addActionListener(arg0 ->
- {
- txtrConsole.setFont(new Font("Monospaced", Font.PLAIN, Integer.parseInt(font)));
- });
+ mntmFont.addActionListener(arg0 -> txtrConsole.setFont(new Font("Monospaced", Font.PLAIN, Integer.parseInt(font))));
mnFont.add(mntmFont);
}
@@ -183,10 +180,7 @@ public class Gui
final JMenuItem mntmAbout = new JMenuItem("About");
mntmAbout.setFont(new Font("Segoe UI", Font.PLAIN, 13));
- mntmAbout.addActionListener(arg0 ->
- {
- new frmAbout();
- });
+ mntmAbout.addActionListener(arg0 -> new frmAbout());
mnHelp.add(mntmAbout);
// Set icons.
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java
index ba3e593cff..b4097c3f58 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/ui/SystemPanel.java
@@ -41,7 +41,7 @@ import org.l2jmobius.util.Locator;
*/
public class SystemPanel extends JPanel
{
- static final long startTime = System.currentTimeMillis();
+ static final long START_TIME = System.currentTimeMillis();
public SystemPanel()
{
@@ -98,6 +98,7 @@ public class SystemPanel extends JPanel
}
catch (Exception e)
{
+ // Handled above.
}
// Initial update task.
@@ -118,7 +119,7 @@ public class SystemPanel extends JPanel
{
lblConnected.setText("Connected: " + World.getInstance().getAllPlayers().size());
lblMaxConnected.setText("Max connected: " + PlayerCountManager.getInstance().getMaxConnectedCount());
- lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - startTime));
+ lblElapsedTime.setText("Elapsed: " + getDurationBreakdown(System.currentTimeMillis() - START_TIME));
}
}, 1000, 1000);
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/log/ServerLogManager.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/log/ServerLogManager.java
index 811a9c83c0..8d6c13aba4 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/log/ServerLogManager.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/log/ServerLogManager.java
@@ -25,10 +25,6 @@ import java.util.logging.LogManager;
*/
public class ServerLogManager extends LogManager
{
- public ServerLogManager()
- {
- }
-
@Override
public void reset()
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/log/handler/ErrorLogHandler.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/log/handler/ErrorLogHandler.java
index bae9068f1e..decb569a0e 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/log/handler/ErrorLogHandler.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/log/handler/ErrorLogHandler.java
@@ -22,7 +22,7 @@ import java.util.logging.FileHandler;
public class ErrorLogHandler extends FileHandler
{
- public ErrorLogHandler() throws IOException, SecurityException
+ public ErrorLogHandler() throws IOException
{
super();
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginController.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginController.java
index e90a28e4bd..d4db40b5b2 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginController.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginController.java
@@ -47,12 +47,12 @@ public class LoginController
return _instance;
}
- public int assignSessionKeyToLogin(String account, int accessLevel, Socket _csocket)
+ public int assignSessionKeyToLogin(String account, int accessLevel, Socket cSocket)
{
int key = -1;
key = (int) System.currentTimeMillis() & 0xFFFFFF;
_logins.put(account, key);
- _accountsInLoginServer.put(account, _csocket);
+ _accountsInLoginServer.put(account, cSocket);
_accessLevels.put(account, accessLevel);
return key;
}
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginServer.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginServer.java
index 87505495a3..2bd229c823 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginServer.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/LoginServer.java
@@ -72,7 +72,6 @@ public class LoginServer extends Thread
}
catch (IOException e)
{
- continue;
}
}
while (true);
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/data/AccountData.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/data/AccountData.java
index a4ef7b5de4..c3b7c90aa5 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/data/AccountData.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/data/AccountData.java
@@ -24,9 +24,11 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.util.Base64;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.StringTokenizer;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger;
@@ -38,7 +40,6 @@ public class AccountData
{
private static Logger _log = Logger.getLogger(AccountData.class.getName());
private static final String SHA = "SHA";
- private static final String UTF_8 = "UTF-8";
private static final Map _logPass = new ConcurrentHashMap<>();
private static final Map _accessLevels = new ConcurrentHashMap<>();
private static final Map _hackProtection = new ConcurrentHashMap<>();
@@ -78,7 +79,7 @@ public class AccountData
try
{
final MessageDigest md = MessageDigest.getInstance(SHA);
- final byte[] raw = password.getBytes(UTF_8);
+ final byte[] raw = password.getBytes(StandardCharsets.UTF_8);
final byte[] hash = md.digest(raw);
final byte[] expected = _logPass.get(user);
if (expected == null)
@@ -128,7 +129,7 @@ public class AccountData
return ok;
}
- private void readFromDisk(File loginFile) throws NumberFormatException, IOException
+ private void readFromDisk(File loginFile) throws IOException
{
_logPass.clear();
int i = 0;
@@ -165,11 +166,12 @@ public class AccountData
try
{
final FileWriter writer = new FileWriter(new File("data/accounts.txt"));
- for (String name : _logPass.keySet())
+ for (Entry entry : _logPass.entrySet())
{
+ final String name = entry.getKey();
writer.write(name);
writer.write("\t");
- writer.write(Base64.getEncoder().encodeToString(_logPass.get(name)));
+ writer.write(Base64.getEncoder().encodeToString(entry.getValue()));
writer.write("\t");
writer.write("" + _accessLevels.get(name));
writer.write("\r\n");
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/ClientThread.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/ClientThread.java
index 445027d482..454207f79d 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/ClientThread.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/ClientThread.java
@@ -41,7 +41,8 @@ import org.l2jmobius.loginserver.network.serverpackets.ServerList;
public class ClientThread extends Thread
{
- private final static Logger _log = Logger.getLogger(ClientThread.class.getName());
+ private static final Logger _log = Logger.getLogger(ClientThread.class.getName());
+
private final InputStream _in;
private final OutputStream _out;
private final NewCrypt _crypt;
@@ -243,7 +244,7 @@ public class ClientThread extends Thread
int a;
int charpoint;
byte t1;
- final StringBuffer result = new StringBuffer();
+ final StringBuilder result = new StringBuilder();
int counter = 0;
for (int i = 0; i < len; ++i)
{
@@ -305,7 +306,7 @@ public class ClientThread extends Thread
@SuppressWarnings("unused")
private String getTerminatedString(byte[] data, int offset)
{
- final StringBuffer result = new StringBuffer();
+ final StringBuilder result = new StringBuilder();
for (int i = offset; (i < data.length) && (data[i] != 0); ++i)
{
result.append((char) data[i]);
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/HackingException.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/HackingException.java
index 799689a3fb..fc6ff06034 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/HackingException.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/HackingException.java
@@ -19,7 +19,7 @@ package org.l2jmobius.loginserver.network;
public class HackingException extends Exception
{
- String _ip;
+ private final String _ip;
public HackingException(String ip)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/ClientBasePacket.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/ClientBasePacket.java
index 323cedf55f..57fb718d60 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/ClientBasePacket.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/clientpackets/ClientBasePacket.java
@@ -17,6 +17,8 @@
*/
package org.l2jmobius.loginserver.network.clientpackets;
+import java.nio.charset.StandardCharsets;
+
public abstract class ClientBasePacket
{
private final byte[] _decrypt;
@@ -38,8 +40,7 @@ public abstract class ClientBasePacket
public int readC()
{
- final int result = _decrypt[_off++] & 0xFF;
- return result;
+ return _decrypt[_off++] & 0xFF;
}
public int readH()
@@ -65,7 +66,7 @@ public abstract class ClientBasePacket
String result = null;
try
{
- result = new String(_decrypt, _off, _decrypt.length - _off, "UTF-16LE");
+ result = new String(_decrypt, _off, _decrypt.length - _off, StandardCharsets.UTF_16LE);
result = result.substring(0, result.indexOf(0));
}
catch (Exception e)
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java
index b3adf454b8..7c46580d48 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/PlayFail.java
@@ -19,11 +19,11 @@ package org.l2jmobius.loginserver.network.serverpackets;
public class PlayFail extends ServerBasePacket
{
- public static int REASON_TOO_MANY_PLAYERS = 15;
- public static int REASON1 = 1;
- public static int REASON2 = 2;
- public static int REASON3 = 3;
- public static int REASON4 = 4;
+ public static final int REASON_TOO_MANY_PLAYERS = 15;
+ public static final int REASON1 = 1;
+ public static final int REASON2 = 2;
+ public static final int REASON3 = 3;
+ public static final int REASON4 = 4;
private final int _reason;
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerBasePacket.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerBasePacket.java
index 667c00e116..5d30a0a481 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerBasePacket.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/network/serverpackets/ServerBasePacket.java
@@ -18,6 +18,7 @@
package org.l2jmobius.loginserver.network.serverpackets;
import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
public abstract class ServerBasePacket
{
@@ -61,7 +62,7 @@ public abstract class ServerBasePacket
{
if (text != null)
{
- _bao.write(text.getBytes("UTF-16LE"));
+ _bao.write(text.getBytes(StandardCharsets.UTF_16LE));
}
}
catch (Exception e)
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/tools/accountmanager/AccountManager.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/tools/accountmanager/AccountManager.java
index eb924b215b..316299ead2 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/tools/accountmanager/AccountManager.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/tools/accountmanager/AccountManager.java
@@ -24,6 +24,7 @@ import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Base64;
@@ -99,10 +100,10 @@ public class AccountManager
private static void printAccInfo(String fin) throws FileNotFoundException, IOException
{
- final File _test = new File(fin);
- if (!_test.exists())
+ final File test = new File(fin);
+ if (!test.exists())
{
- _test.createNewFile();
+ test.createNewFile();
}
final FileInputStream in = new FileInputStream(fin);
@SuppressWarnings("resource")
@@ -121,15 +122,15 @@ public class AccountManager
private static void updateAccounts(String fin, String fout) throws FileNotFoundException, IOException, NoSuchAlgorithmException
{
- final File _test = new File(fin);
- if (!_test.exists())
+ final File test = new File(fin);
+ if (!test.exists())
{
- _test.createNewFile();
+ test.createNewFile();
}
final FileInputStream in = new FileInputStream(fin);
final FileWriter out = new FileWriter(fout);
final MessageDigest md = MessageDigest.getInstance("SHA");
- byte[] newpass = _pass.getBytes("UTF-8");
+ byte[] newpass = _pass.getBytes(StandardCharsets.UTF_8);
newpass = md.digest(newpass);
try
{
@@ -159,7 +160,7 @@ public class AccountManager
System.out.println("Account for user " + _uname + " deleted");
}
}
- if (line == "")
+ if (line.equals(""))
{
continue;
}
@@ -177,10 +178,10 @@ public class AccountManager
{
out.close();
in.close();
- final File _fin = new File(fin);
- final File _fout = new File(fout);
- _fin.delete();
- _fout.renameTo(_fin);
+ final File fileIn = new File(fin);
+ final File fileOut = new File(fout);
+ fileIn.delete();
+ fileOut.renameTo(fileIn);
}
catch (Exception e)
{
@@ -191,10 +192,10 @@ public class AccountManager
{
out.close();
in.close();
- final File _fin = new File(fin);
- final File _fout = new File(fout);
- _fin.delete();
- _fout.renameTo(_fin);
+ final File fileIn = new File(fin);
+ final File fileOut = new File(fout);
+ fileIn.delete();
+ fileOut.renameTo(fileIn);
}
catch (Exception e)
{
diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Locator.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Locator.java
index 7fbb5e04d8..6acd00b2b7 100644
--- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Locator.java
+++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/util/Locator.java
@@ -77,7 +77,7 @@ public class Locator
final String u = url.toString();
if (u.startsWith("jar:file:"))
{
- final int pling = u.indexOf("!");
+ final int pling = u.indexOf('!');
final String jarName = u.substring(4, pling);
return new File(fromURI(jarName));
}
@@ -118,7 +118,7 @@ public class Locator
{
throw new IllegalArgumentException("Can only handle valid file: URIs");
}
- final StringBuffer buf = new StringBuffer(url.getHost());
+ final StringBuilder buf = new StringBuilder(url.getHost());
if (buf.length() > 0)
{
buf.insert(0, File.separatorChar).insert(0, File.separatorChar);
@@ -133,8 +133,7 @@ public class Locator
{
uri = uri.substring(1);
}
- final String path = decodeUri(uri);
- return path;
+ return decodeUri(uri);
}
/**
@@ -148,7 +147,7 @@ public class Locator
{
return uri;
}
- final StringBuffer sb = new StringBuffer();
+ final StringBuilder sb = new StringBuilder();
final CharacterIterator iter = new StringCharacterIterator(uri);
for (char c = iter.first(); c != CharacterIterator.DONE; c = iter.next())
{
@@ -171,8 +170,7 @@ public class Locator
sb.append(c);
}
}
- final String path = sb.toString();
- return path;
+ return sb.toString();
}
/**
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/AdminCommands.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/AdminCommands.xml
index 33e3224039..266edd3190 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/AdminCommands.xml
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/AdminCommands.xml
@@ -592,9 +592,6 @@
-
-
-
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
index a44924f801..d1791fb5b6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
@@ -145,9 +145,9 @@ public class FeedableBeasts extends AbstractNpcAI
_chance = chance;
}
- public void addMobs(int spice, int[][] Mobs)
+ public void addMobs(int spice, int[][] mobs)
{
- _spiceToMob.put(spice, Mobs);
+ _spiceToMob.put(spice, mobs);
}
public Integer getMob(int spice, int mobType, int classType)
@@ -395,12 +395,9 @@ public class FeedableBeasts extends AbstractNpcAI
}
// remove the feedinfo of the mob that got despawned, if any
- if (FEED_INFO.containsKey(npc.getObjectId()))
+ if (FEED_INFO.containsKey(npc.getObjectId()) && (FEED_INFO.get(npc.getObjectId()) == player.getObjectId()))
{
- if (FEED_INFO.get(npc.getObjectId()) == player.getObjectId())
- {
- FEED_INFO.remove(npc.getObjectId());
- }
+ FEED_INFO.remove(npc.getObjectId());
}
// despawn the old mob
// TODO: same code? FIXED?
@@ -484,26 +481,23 @@ public class FeedableBeasts extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
- if (event.equalsIgnoreCase("polymorph Mad Cow") && (npc != null) && (player != null))
+ if (event.equalsIgnoreCase("polymorph Mad Cow") && (npc != null) && (player != null) && MAD_COW_POLYMORPH.containsKey(npc.getId()))
{
- if (MAD_COW_POLYMORPH.containsKey(npc.getId()))
+ // remove the feed info from the previous mob
+ if (FEED_INFO.get(npc.getObjectId()) == player.getObjectId())
{
- // remove the feed info from the previous mob
- if (FEED_INFO.get(npc.getObjectId()) == player.getObjectId())
- {
- FEED_INFO.remove(npc.getObjectId());
- }
- // despawn the mad cow
- npc.deleteMe();
- // spawn the new mob
- final Attackable nextNpc = (Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc);
-
- // register the player in the feedinfo for the mob that just spawned
- FEED_INFO.put(nextNpc.getObjectId(), player.getObjectId());
- nextNpc.setRunning();
- nextNpc.addDamageHate(player, 0, 99999);
- nextNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
+ FEED_INFO.remove(npc.getObjectId());
}
+ // despawn the mad cow
+ npc.deleteMe();
+ // spawn the new mob
+ final Attackable nextNpc = (Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc);
+
+ // register the player in the feedinfo for the mob that just spawned
+ FEED_INFO.put(nextNpc.getObjectId(), player.getObjectId());
+ nextNpc.setRunning();
+ nextNpc.addDamageHate(player, 0, 99999);
+ nextNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
}
return super.onAdvEvent(event, npc, player);
}
@@ -548,7 +542,7 @@ public class FeedableBeasts extends AbstractNpcAI
{
food = GOLDEN_SPICE;
}
- else if (skillId == SKILL_CRYSTAL_SPICE)
+ else // if (skillId == SKILL_CRYSTAL_SPICE)
{
food = CRYSTAL_SPICE;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/CrumaTower/SummonPc.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/CrumaTower/SummonPc.java
index 5fb5e271ba..9d59ea7d7e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/CrumaTower/SummonPc.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/CrumaTower/SummonPc.java
@@ -71,14 +71,12 @@ public class SummonPc extends AbstractNpcAI
final Attackable monster = (Attackable) npc;
if (monster.getMostHated() != null)
{
- if (((monster.getMostHated() == attacker) && (chance < 50)) || (chance < 10))
+ if ((((monster.getMostHated() == attacker) && (chance < 50)) || (chance < 10)) //
+ && ((SUMMON_PC.getSkill().getMpConsume() < npc.getCurrentMp()) && (SUMMON_PC.getSkill().getHpConsume() < npc.getCurrentHp()) && !npc.isSkillDisabled(SUMMON_PC.getSkill())))
{
- if ((SUMMON_PC.getSkill().getMpConsume() < npc.getCurrentMp()) && (SUMMON_PC.getSkill().getHpConsume() < npc.getCurrentHp()) && !npc.isSkillDisabled(SUMMON_PC.getSkill()))
- {
- npc.setTarget(attacker);
- npc.doCast(SUMMON_PC.getSkill());
- npc.getVariables().set("attacked", true);
- }
+ npc.setTarget(attacker);
+ npc.doCast(SUMMON_PC.getSkill());
+ npc.getVariables().set("attacked", true);
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
index 1148bca0e5..b4675d0363 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/Parade.java
@@ -216,7 +216,7 @@ public class Parade extends AbstractNpcAI
@Override
public void run()
{
- if (spawns.size() <= 0)
+ if (spawns.isEmpty())
{
return;
}
@@ -235,7 +235,7 @@ public class Parade extends AbstractNpcAI
}
}
}
- if ((spawns.size() == 0) && (deleteTask != null))
+ if ((spawns.isEmpty()) && (deleteTask != null))
{
deleteTask.cancel(false);
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
index efbbd7b0ee..cf3bbd5eb8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/FantasyIsle/TalentShow.java
@@ -56,7 +56,7 @@ public class TalentShow extends AbstractNpcAI
32424, 32425, 32426, 32427, 32428
};
// @formatter:on
- private static boolean IS_STARTED = false;
+ private static boolean HAS_STARTED = false;
private static NpcStringId[] MESSAGES =
{
NpcStringId.HOW_COME_PEOPLE_ARE_NOT_HERE_WE_ARE_ABOUT_TO_START_THE_SHOW_HMM,
@@ -173,7 +173,7 @@ public class TalentShow extends AbstractNpcAI
private void load()
{
- // TODO put this stuff in Routes.xml
+ // TODO: Put this stuff in Routes.xml
TALKS.put("1", new ShoutInfo(MESSAGES[1], "2", 1000));
TALKS.put("2", new ShoutInfo(MESSAGES[2], "3", 6000));
TALKS.put("3", new ShoutInfo(MESSAGES[3], "4", 4000));
@@ -310,7 +310,7 @@ public class TalentShow extends AbstractNpcAI
@Override
public String onSpawn(Npc npc)
{
- if (IS_STARTED)
+ if (HAS_STARTED)
{
switch (npc.getId())
{
@@ -369,11 +369,11 @@ public class TalentShow extends AbstractNpcAI
if (event.equalsIgnoreCase("Start"))
{
- IS_STARTED = true;
+ HAS_STARTED = true;
addSpawn(MC, -56698, -56430, -2008, 32768, false, 0);
startQuestTimer("Start", 14400000L, null, null); // repeat
}
- else if ((npc != null) && IS_STARTED)
+ else if ((npc != null) && HAS_STARTED)
{
// TODO switch on event
if (event.equalsIgnoreCase("6"))
@@ -485,7 +485,7 @@ public class TalentShow extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("clean_npc"))
{
- IS_STARTED = false;
+ HAS_STARTED = false;
npc.deleteMe();
}
else if (TALKS.containsKey(event))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.java
index 27f6e6b1f1..a7feaef5e3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/ForgeOfTheGods/TarBeetleSpawn.java
@@ -243,26 +243,23 @@ public class TarBeetleSpawn implements IXmlReader
}
catch (Exception e)
{
- e.printStackTrace();
+ LOGGER.warning("Problem with TarBeetleSpawn: " + e.getMessage());
}
}
public void refreshShots()
{
- if (_spawn.size() > 0)
+ for (Npc npc : _spawn)
{
- for (Npc npc : _spawn)
+ final int val = npc.getScriptValue();
+ if (val == 5)
{
- final int val = npc.getScriptValue();
- if (val == 5)
- {
- npc.deleteMe();
- _spawn.remove(npc);
- }
- else
- {
- npc.setScriptValue(val + 1);
- }
+ npc.deleteMe();
+ _spawn.remove(npc);
+ }
+ else
+ {
+ npc.setScriptValue(val + 1);
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java
index 5f3f329a69..b9d5ed665b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import org.l2jmobius.Config;
@@ -510,11 +511,11 @@ public class EnergySeeds extends AbstractNpcAI
public void stopAI(GraciaSeeds type)
{
- for (Npc seed : _spawnedNpcs.keySet())
+ for (Entry entry : _spawnedNpcs.entrySet())
{
- if (type == SPAWNS.get(_spawnedNpcs.get(seed))._seedId)
+ if (type == SPAWNS.get(entry.getValue())._seedId)
{
- seed.deleteMe();
+ entry.getKey().deleteMe();
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java
index 9f494e4b7e..63c3763e20 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/Lindvior.java
@@ -47,10 +47,6 @@ public class Lindvior extends AbstractNpcAI
private static boolean ALT_MODE = false;
private static int ALT_MODE_MIN = 60; // schedule delay in minutes if ALT_MODE enabled
- private Npc _lindviorCamera = null;
- private Npc _tomaris = null;
- private Npc _artius = null;
-
public Lindvior()
{
scheduleNextLindviorVisit();
@@ -92,13 +88,13 @@ public class Lindvior extends AbstractNpcAI
}
case "start":
{
- _lindviorCamera = SpawnTable.getInstance().getAnySpawn(LINDVIOR_CAMERA).getLastSpawn();
- _tomaris = SpawnTable.getInstance().getAnySpawn(TOMARIS).getLastSpawn();
- _artius = SpawnTable.getInstance().getAnySpawn(ARTIUS).getLastSpawn();
- startQuestTimer("tomaris_shout1", 1000, _tomaris, null);
- startQuestTimer("artius_shout", 60000, _artius, null);
- startQuestTimer("tomaris_shout2", 90000, _tomaris, null);
- startQuestTimer("lindvior_scene", 120000, _lindviorCamera, null);
+ final Npc lindviorCamera = SpawnTable.getInstance().getAnySpawn(LINDVIOR_CAMERA).getLastSpawn();
+ final Npc tomaris = SpawnTable.getInstance().getAnySpawn(TOMARIS).getLastSpawn();
+ final Npc artius = SpawnTable.getInstance().getAnySpawn(ARTIUS).getLastSpawn();
+ startQuestTimer("tomaris_shout1", 1000, tomaris, null);
+ startQuestTimer("artius_shout", 60000, artius, null);
+ startQuestTimer("tomaris_shout2", 90000, tomaris, null);
+ startQuestTimer("lindvior_scene", 120000, lindviorCamera, null);
scheduleNextLindviorVisit();
break;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/AbyssGaze/AbyssGaze.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/AbyssGaze/AbyssGaze.java
index eee895bd07..486eadd2bd 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/AbyssGaze/AbyssGaze.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/AbyssGaze/AbyssGaze.java
@@ -61,12 +61,9 @@ public class AbyssGaze extends AbstractNpcAI
htmltext = "32539-1.htm";
}
}
- else if (event.equals("enter_seed"))
+ else if (event.equals("enter_seed") && (SoIManager.getCurrentStage() == 3))
{
- if (SoIManager.getCurrentStage() == 3)
- {
- return null;
- }
+ return null;
}
return htmltext;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/FortuneTelling/FortuneTelling.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/FortuneTelling/FortuneTelling.java
index fed7a8dac1..9a743c4103 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/FortuneTelling/FortuneTelling.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/AI/NPC/FortuneTelling/FortuneTelling.java
@@ -43,7 +43,7 @@ public class FortuneTelling extends AbstractNpcAI
@Override
public String onTalk(Npc npc, PlayerInstance player)
{
- String htmltext = getNoQuestMsg(player);
+ String htmltext;
if (player.getAdena() < COST)
{
htmltext = "lowadena.htm";
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
index 3541b12211..b49286b739 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
@@ -63,10 +63,6 @@ public class HallOfErosionAttack extends AbstractNpcAI
{
tumorCount += value;
}
-
- public HEAWorld()
- {
- }
}
private static final int INSTANCEID = 119;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
index 038dd7c425..09bdfd63fa 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
@@ -57,10 +57,6 @@ public class HallOfErosionDefence extends AbstractNpcAI
protected Npc deadTumor;
public long startTime = 0;
public ScheduledFuture finishTask = null;
-
- public HEDWorld()
- {
- }
}
private static final int INSTANCEID = 120;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java
index 174dcc1857..acf8255cc3 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingAttack/HallOfSufferingAttack.java
@@ -56,10 +56,6 @@ public class HallOfSufferingAttack extends AbstractNpcAI
0,
0
}; // 0: instance start, 1: finish time
-
- public HSAWorld()
- {
- }
}
private static final int INSTANCEID = 115;
@@ -512,74 +508,72 @@ public class HallOfSufferingAttack extends AbstractNpcAI
runTwins(world);
}
}
- else if ((world.getStatus() == 6) && ((npc.getId() == KLODEKUS) || (npc.getId() == KLANIKUS)))
+ else if (((world.getStatus() == 6) && ((npc.getId() == KLODEKUS) || (npc.getId() == KLANIKUS))) //
+ && (world.klanikus.isDead() && world.klodekus.isDead()))
{
- if (world.klanikus.isDead() && world.klodekus.isDead())
+ world.incStatus();
+ world.storeTime[1] = System.currentTimeMillis();
+
+ final Long finishDiff = world.storeTime[1] - world.storeTime[0];
+ if (finishDiff < 1260000)
{
- world.incStatus();
- world.storeTime[1] = System.currentTimeMillis();
-
- final Long finishDiff = world.storeTime[1] - world.storeTime[0];
- if (finishDiff < 1260000)
- {
- world.setParameter("tag", 13777);
- }
- else if (finishDiff < 1380000)
- {
- world.setParameter("tag", 13778);
- }
- else if (finishDiff < 1500000)
- {
- world.setParameter("tag", 13779);
- }
- else if (finishDiff < 1620000)
- {
- world.setParameter("tag", 13780);
- }
- else if (finishDiff < 1740000)
- {
- world.setParameter("tag", 13781);
- }
- else if (finishDiff < 1860000)
- {
- world.setParameter("tag", 13782);
- }
- else if (finishDiff < 1980000)
- {
- world.setParameter("tag", 13783);
- }
- else if (finishDiff < 2100000)
- {
- world.setParameter("tag", 13784);
- }
- else if (finishDiff < 2220000)
- {
- world.setParameter("tag", 13785);
- }
- else
- {
- world.setParameter("tag", 13786);
- }
-
- world.klanikus = null;
- world.klodekus = null;
- cancelQuestTimers("ressurectTwin");
- cancelQuestTimers("spawnBossGuards");
- cancelQuestTimers("isTwinSeparated");
- addSpawn(TEPIOS, TEPIOS_SPAWN[0], TEPIOS_SPAWN[1], TEPIOS_SPAWN[2], 0, false, 0, false, world.getInstanceId());
-
- for (PlayerInstance killer : world.getAllowed())
- {
- if (killer != null)
- {
- killer.sendPacket(new ExSendUIEvent(killer, true, true, 0, 0, ""));
- }
- }
-
- final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId());
- inst.setDuration(5 * 60000);
- inst.setEmptyDestroyTime(0);
+ world.setParameter("tag", 13777);
}
+ else if (finishDiff < 1380000)
+ {
+ world.setParameter("tag", 13778);
+ }
+ else if (finishDiff < 1500000)
+ {
+ world.setParameter("tag", 13779);
+ }
+ else if (finishDiff < 1620000)
+ {
+ world.setParameter("tag", 13780);
+ }
+ else if (finishDiff < 1740000)
+ {
+ world.setParameter("tag", 13781);
+ }
+ else if (finishDiff < 1860000)
+ {
+ world.setParameter("tag", 13782);
+ }
+ else if (finishDiff < 1980000)
+ {
+ world.setParameter("tag", 13783);
+ }
+ else if (finishDiff < 2100000)
+ {
+ world.setParameter("tag", 13784);
+ }
+ else if (finishDiff < 2220000)
+ {
+ world.setParameter("tag", 13785);
+ }
+ else
+ {
+ world.setParameter("tag", 13786);
+ }
+
+ world.klanikus = null;
+ world.klodekus = null;
+ cancelQuestTimers("ressurectTwin");
+ cancelQuestTimers("spawnBossGuards");
+ cancelQuestTimers("isTwinSeparated");
+ addSpawn(TEPIOS, TEPIOS_SPAWN[0], TEPIOS_SPAWN[1], TEPIOS_SPAWN[2], 0, false, 0, false, world.getInstanceId());
+
+ for (PlayerInstance killer : world.getAllowed())
+ {
+ if (killer != null)
+ {
+ killer.sendPacket(new ExSendUIEvent(killer, true, true, 0, 0, ""));
+ }
+ }
+
+ final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId());
+ inst.setDuration(5 * 60000);
+ inst.setEmptyDestroyTime(0);
}
}
return "";
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java
index 971ff4ef61..291ad1137a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfSufferingDefence/HallOfSufferingDefence.java
@@ -56,10 +56,6 @@ public class HallOfSufferingDefence extends AbstractNpcAI
0,
0
}; // 0: instance start, 1: finish time
-
- public HSDWorld()
- {
- }
}
private static final int INSTANCEID = 116; // this is the client number
@@ -512,74 +508,72 @@ public class HallOfSufferingDefence extends AbstractNpcAI
runTwins(world);
}
}
- else if ((world.getStatus() == 6) && ((npc.getId() == KLODEKUS) || (npc.getId() == KLANIKUS)))
+ else if (((world.getStatus() == 6) && ((npc.getId() == KLODEKUS) || (npc.getId() == KLANIKUS))) //
+ && (world.klanikus.isDead() && world.klodekus.isDead()))
{
- if (world.klanikus.isDead() && world.klodekus.isDead())
+ world.incStatus();
+ world.storeTime[1] = System.currentTimeMillis();
+
+ final Long finishDiff = world.storeTime[1] - world.storeTime[0];
+ if (finishDiff < 1260000)
{
- world.incStatus();
- world.storeTime[1] = System.currentTimeMillis();
-
- final Long finishDiff = world.storeTime[1] - world.storeTime[0];
- if (finishDiff < 1260000)
- {
- world.setParameter("tag", 13777);
- }
- else if (finishDiff < 1380000)
- {
- world.setParameter("tag", 13778);
- }
- else if (finishDiff < 1500000)
- {
- world.setParameter("tag", 13779);
- }
- else if (finishDiff < 1620000)
- {
- world.setParameter("tag", 13780);
- }
- else if (finishDiff < 1740000)
- {
- world.setParameter("tag", 13781);
- }
- else if (finishDiff < 1860000)
- {
- world.setParameter("tag", 13782);
- }
- else if (finishDiff < 1980000)
- {
- world.setParameter("tag", 13783);
- }
- else if (finishDiff < 2100000)
- {
- world.setParameter("tag", 13784);
- }
- else if (finishDiff < 2220000)
- {
- world.setParameter("tag", 13785);
- }
- else
- {
- world.setParameter("tag", 13786);
- }
-
- world.klanikus = null;
- world.klodekus = null;
- cancelQuestTimers("ressurectTwin");
- cancelQuestTimers("spawnBossGuards");
- cancelQuestTimers("isTwinSeparated");
- addSpawn(TEPIOS, TEPIOS_SPAWN[0], TEPIOS_SPAWN[1], TEPIOS_SPAWN[2], 0, false, 0, false, world.getInstanceId());
-
- for (PlayerInstance killer : world.getAllowed())
- {
- if (killer != null)
- {
- killer.sendPacket(new ExSendUIEvent(killer, true, true, 0, 0, ""));
- }
- }
-
- final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId());
- inst.setDuration(5 * 60000);
- inst.setEmptyDestroyTime(0);
+ world.setParameter("tag", 13777);
}
+ else if (finishDiff < 1380000)
+ {
+ world.setParameter("tag", 13778);
+ }
+ else if (finishDiff < 1500000)
+ {
+ world.setParameter("tag", 13779);
+ }
+ else if (finishDiff < 1620000)
+ {
+ world.setParameter("tag", 13780);
+ }
+ else if (finishDiff < 1740000)
+ {
+ world.setParameter("tag", 13781);
+ }
+ else if (finishDiff < 1860000)
+ {
+ world.setParameter("tag", 13782);
+ }
+ else if (finishDiff < 1980000)
+ {
+ world.setParameter("tag", 13783);
+ }
+ else if (finishDiff < 2100000)
+ {
+ world.setParameter("tag", 13784);
+ }
+ else if (finishDiff < 2220000)
+ {
+ world.setParameter("tag", 13785);
+ }
+ else
+ {
+ world.setParameter("tag", 13786);
+ }
+
+ world.klanikus = null;
+ world.klodekus = null;
+ cancelQuestTimers("ressurectTwin");
+ cancelQuestTimers("spawnBossGuards");
+ cancelQuestTimers("isTwinSeparated");
+ addSpawn(TEPIOS, TEPIOS_SPAWN[0], TEPIOS_SPAWN[1], TEPIOS_SPAWN[2], 0, false, 0, false, world.getInstanceId());
+
+ for (PlayerInstance killer : world.getAllowed())
+ {
+ if (killer != null)
+ {
+ killer.sendPacket(new ExSendUIEvent(killer, true, true, 0, 0, ""));
+ }
+ }
+
+ final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId());
+ inst.setDuration(5 * 60000);
+ inst.setEmptyDestroyTime(0);
}
}
return "";
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java
index c42a4066c8..14ca03a887 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java
@@ -69,10 +69,6 @@ public class HeartInfinityAttack extends AbstractNpcAI
{
tumorCount += value;
}
-
- public HIAWorld()
- {
- }
}
private static final String qn = "HeartInfinityAttack";
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java
index 3ac48ba7ad..2c41940ee5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java
@@ -60,10 +60,6 @@ public class HeartInfinityDefence extends AbstractNpcAI
protected ScheduledFuture finishTask = null;
protected ScheduledFuture timerTask = null;
protected ScheduledFuture wagonSpawnTask = null;
-
- public HIDWorld()
- {
- }
}
private static final String qn = "HeartInfinityDefence";
@@ -406,16 +402,13 @@ public class HeartInfinityDefence extends AbstractNpcAI
ThreadPool.schedule(() ->
{
- if (!conquestEnded)
+ if (!conquestEnded && !world.deadTumors.isEmpty())
{
- if (!world.deadTumors.isEmpty())
+ for (Npc npc : world.deadTumors)
{
- for (Npc npc : world.deadTumors)
+ if (npc != null)
{
- if (npc != null)
- {
- spawnCoffin(npc, world);
- }
+ spawnCoffin(npc, world);
}
}
}
@@ -563,13 +556,10 @@ public class HeartInfinityDefence extends AbstractNpcAI
}
final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc);
- if (tmpworld instanceof HIDWorld)
+ if ((tmpworld instanceof HIDWorld) && (npc.getId() == SOULWAGON))
{
- if (npc.getId() == SOULWAGON)
- {
- // ((MonsterInstance) npc).setPassive(true);
- ((MonsterInstance) npc).getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
- }
+ // ((MonsterInstance) npc).setPassive(true);
+ ((MonsterInstance) npc).getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
}
return super.onSpawn(npc);
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java
index 7374e98e01..760724c7c8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java
@@ -32,14 +32,12 @@ import org.l2jmobius.gameserver.instancemanager.InstanceManager;
import org.l2jmobius.gameserver.instancemanager.SoDManager;
import org.l2jmobius.gameserver.model.CommandChannel;
import org.l2jmobius.gameserver.model.Location;
-import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.Summon;
import org.l2jmobius.gameserver.model.actor.instance.DoorInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
-import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.instancezone.Instance;
import org.l2jmobius.gameserver.model.instancezone.InstanceWorld;
import org.l2jmobius.gameserver.model.quest.QuestState;
@@ -96,11 +94,6 @@ public class SeedOfDestruction extends AbstractNpcAI
private static final int[] MOB_IDS = {22536, 22537, 22538, 22539, 22540, 22541, 22542, 22543, 22544, 22547, 22550, 22551, 22552, 22596, 29162};
private static final Location MOVE_TO_TIAT = new Location(-250403, 207273, -11952, 16384);
- // Traps/Skills
- private static final SkillHolder TRAP_HOLD = new SkillHolder(4186, 9); // 18720-18728
- private static final SkillHolder TRAP_STUN = new SkillHolder(4072, 10); // 18729-18736
- private static final SkillHolder TRAP_DAMAGE = new SkillHolder(5340, 4); // 18737-18774
-
// Doors/Walls/Zones
private static final int[] ATTACKABLE_DOORS = {12240005, 12240006, 12240007, 12240008, 12240009, 12240010, 12240013, 12240014, 12240015, 12240016, 12240017, 12240018, 12240021, 12240022, 12240023, 12240024, 12240025, 12240026, 12240028, 12240029, 12240030};
private static final int[] ENTRANCE_ROOM_DOORS = {12240001, 12240002};
@@ -971,7 +964,6 @@ public class SeedOfDestruction extends AbstractNpcAI
player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
player.setInstanceId(teleto.instanceId);
player.teleToLocation(teleto.x, teleto.y, teleto.z);
- return;
}
private void teleportplayer(PlayerInstance player, teleCoord teleto, SODWorld world)
@@ -1092,21 +1084,7 @@ public class SeedOfDestruction extends AbstractNpcAI
// traps
if ((mob[0] >= 18720) && (mob[0] <= 18774))
{
- Skill skill = null;
- if (mob[0] <= 18728)
- {
- skill = TRAP_HOLD.getSkill();
- }
- else if (mob[0] <= 18736)
- {
- skill = TRAP_STUN.getSkill();
- }
- else
- // if (mob[0] <= 18774)
- {
- skill = TRAP_DAMAGE.getSkill();
- }
- addTrap(mob[0], mob[1], mob[2], mob[3], mob[4], skill, world.getInstanceId());
+ addTrap(mob[0], mob[1], mob[2], mob[3], mob[4], world.getInstanceId());
continue;
}
@@ -1171,12 +1149,6 @@ public class SeedOfDestruction extends AbstractNpcAI
}
}
- @Override
- public String onSkillSee(Npc npc, PlayerInstance caster, Skill skill, WorldObject[] targets, boolean isPet)
- {
- return super.onSkillSee(npc, caster, skill, targets, isPet);
- }
-
@Override
public String onSpawn(Npc npc)
{
@@ -1203,18 +1175,15 @@ public class SeedOfDestruction extends AbstractNpcAI
}
else if ((world.getStatus() <= 8) && (npc.getId() == TIAT))
{
- if (npc.getCurrentHp() < (npc.getMaxHp() / 2))
+ if ((npc.getCurrentHp() < (npc.getMaxHp() / 2)) && (_numAtk < 1))
{
- if (_numAtk < 1)
- {
- final ExShowScreenMessage message4 = new ExShowScreenMessage(NpcStringId.COME_OUT_WARRIORS_PROTECT_SEED_OF_DESTRUCTION, 5, 5000);
- sendScreenMessage(world, message4);
- world._tiat.doCast(SkillData.getInstance().getSkill(5818, 1));
- world._tiat.doCast(SkillData.getInstance().getSkill(181, 1));
- world.deviceSpawnedMobCount = 0;
- spawn(world, THRONE_PORTALS, false, true);
- _numAtk++;
- }
+ final ExShowScreenMessage message4 = new ExShowScreenMessage(NpcStringId.COME_OUT_WARRIORS_PROTECT_SEED_OF_DESTRUCTION, 5, 5000);
+ sendScreenMessage(world, message4);
+ world._tiat.doCast(SkillData.getInstance().getSkill(5818, 1));
+ world._tiat.doCast(SkillData.getInstance().getSkill(181, 1));
+ world.deviceSpawnedMobCount = 0;
+ spawn(world, THRONE_PORTALS, false, true);
+ _numAtk++;
}
}
}
@@ -1228,60 +1197,64 @@ public class SeedOfDestruction extends AbstractNpcAI
if (tmpworld instanceof SODWorld)
{
final SODWorld world = (SODWorld) tmpworld;
- if (event.equals("ThroneSpawn"))
+ switch (event)
{
- world._tiat = addSpawn(TIAT, -250400, 207271, -11961, 16285, false, 0, false, world.getInstanceId());
- world._tiat.setRandomWalking(false);
- world._naezdTR1 = addSpawn(NAEZD, -250154, 207203, -11970, 33818, false, 0, false, world.getInstanceId());
- world._naezdTR1.setRandomWalking(false);
- world._naezdTR2 = addSpawn(NAEZD, -250209, 206941, -11966, 27379, false, 0, false, world.getInstanceId());
- world._naezdTR2.setRandomWalking(false);
- world._naezdTL1 = addSpawn(NAEZD, -250652, 207203, -11970, 0, false, 0, false, world.getInstanceId());
- world._naezdTL1.setRandomWalking(false);
- world._naezdTL2 = addSpawn(NAEZD, -250597, 206941, -11966, 6867, false, 0, false, world.getInstanceId());
- world._naezdTL2.setRandomWalking(false);
-
- for (int i = 0; i < 12; i++)
+ case "ThroneSpawn":
{
- final Npc npc1 = addSpawn(22543, ONETR[i][0], ONETR[i][1], ONETR[i][2], 16285, false, 0, false, world.getInstanceId());
- npc1.setRandomWalking(false);
- world._mags.add(npc1);
-
- final Npc npc2 = addSpawn(22541, TWOTR[i][0], TWOTR[i][1], TWOTR[i][2], 16285, false, 0, false, world.getInstanceId());
- npc2.setRandomWalking(false);
- }
- for (int i = 0; i < 6; i++)
- {
- final Npc npc3 = addSpawn(FRETR[i][0], FRETR[i][1], FRETR[i][2], FRETR[i][3], 16285, false, 0, false, world.getInstanceId());
- npc3.setRandomWalking(false);
-
- final Npc npc4 = addSpawn(22536, FORTR[i][0], FORTR[i][1], FORTR[i][2], 16285, false, 0, false, world.getInstanceId());
- npc4.setRandomWalking(false);
-
- final Npc npc5 = addSpawn(22537, FIVETR[i][0], FIVETR[i][1], FIVETR[i][2], 16285, false, 0, false, world.getInstanceId());
- npc5.setRandomWalking(false);
- }
-
- spawn(world, FORT_PORTALS, false, true);
- }
- else if (event.equals("KillTiatPart1"))
- {
- playMovie(world, Movie.SC_BOSS_TIAT_ENDING_SUCCES);
- InstanceManager.getInstance().getInstance(world.getInstanceId()).getNpcs().forEach(Npc::deleteMe);
- }
- else if (event.equals("Spawn"))
- {
- if (world.getStatus() <= 7)
- {
- final PlayerInstance target = world.getAllowed().stream().findAny().get();
- if ((world.deviceSpawnedMobCount < MAX_DEVICE_SPAWNED_MOB_COUNT) && (target != null) && ((npc != null) && (target.getInstanceId() == npc.getInstanceId())) && !target.isDead())
+ world._tiat = addSpawn(TIAT, -250400, 207271, -11961, 16285, false, 0, false, world.getInstanceId());
+ world._tiat.setRandomWalking(false);
+ world._naezdTR1 = addSpawn(NAEZD, -250154, 207203, -11970, 33818, false, 0, false, world.getInstanceId());
+ world._naezdTR1.setRandomWalking(false);
+ world._naezdTR2 = addSpawn(NAEZD, -250209, 206941, -11966, 27379, false, 0, false, world.getInstanceId());
+ world._naezdTR2.setRandomWalking(false);
+ world._naezdTL1 = addSpawn(NAEZD, -250652, 207203, -11970, 0, false, 0, false, world.getInstanceId());
+ world._naezdTL1.setRandomWalking(false);
+ world._naezdTL2 = addSpawn(NAEZD, -250597, 206941, -11966, 6867, false, 0, false, world.getInstanceId());
+ world._naezdTL2.setRandomWalking(false);
+ for (int i = 0; i < 12; i++)
{
- final Attackable mob = (Attackable) addSpawn(SPAWN_MOB_IDS[Rnd.get(SPAWN_MOB_IDS.length)], npc.getSpawn().getX(), npc.getSpawn().getY(), npc.getSpawn().getZ(), npc.getSpawn().getHeading(), false, 0, false, world.getInstanceId());
- world.deviceSpawnedMobCount++;
- mob.setSeeThroughSilentMove(true);
- mob.setRunning();
- mob.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MOVE_TO_TIAT);
+ final Npc npc1 = addSpawn(22543, ONETR[i][0], ONETR[i][1], ONETR[i][2], 16285, false, 0, false, world.getInstanceId());
+ npc1.setRandomWalking(false);
+ world._mags.add(npc1);
+
+ final Npc npc2 = addSpawn(22541, TWOTR[i][0], TWOTR[i][1], TWOTR[i][2], 16285, false, 0, false, world.getInstanceId());
+ npc2.setRandomWalking(false);
}
+ for (int i = 0; i < 6; i++)
+ {
+ final Npc npc3 = addSpawn(FRETR[i][0], FRETR[i][1], FRETR[i][2], FRETR[i][3], 16285, false, 0, false, world.getInstanceId());
+ npc3.setRandomWalking(false);
+
+ final Npc npc4 = addSpawn(22536, FORTR[i][0], FORTR[i][1], FORTR[i][2], 16285, false, 0, false, world.getInstanceId());
+ npc4.setRandomWalking(false);
+
+ final Npc npc5 = addSpawn(22537, FIVETR[i][0], FIVETR[i][1], FIVETR[i][2], 16285, false, 0, false, world.getInstanceId());
+ npc5.setRandomWalking(false);
+ }
+ spawn(world, FORT_PORTALS, false, true);
+ break;
+ }
+ case "KillTiatPart1":
+ {
+ playMovie(world, Movie.SC_BOSS_TIAT_ENDING_SUCCES);
+ InstanceManager.getInstance().getInstance(world.getInstanceId()).getNpcs().forEach(Npc::deleteMe);
+ break;
+ }
+ case "Spawn":
+ {
+ if (world.getStatus() <= 7)
+ {
+ final PlayerInstance target = world.getAllowed().stream().findAny().get();
+ if ((world.deviceSpawnedMobCount < MAX_DEVICE_SPAWNED_MOB_COUNT) && (target != null) && ((npc != null) && (target.getInstanceId() == npc.getInstanceId())) && !target.isDead())
+ {
+ final Attackable mob = (Attackable) addSpawn(SPAWN_MOB_IDS[Rnd.get(SPAWN_MOB_IDS.length)], npc.getSpawn().getX(), npc.getSpawn().getY(), npc.getSpawn().getZ(), npc.getSpawn().getHeading(), false, 0, false, world.getInstanceId());
+ world.deviceSpawnedMobCount++;
+ mob.setSeeThroughSilentMove(true);
+ mob.setRunning();
+ mob.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, MOVE_TO_TIAT);
+ }
+ }
+ break;
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java
index 6fcd258f8f..a281798535 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipController.java
@@ -286,28 +286,25 @@ public abstract class AirShipController extends AbstractNpcAI
@Override
public String onEnterZone(Creature creature, ZoneType zone)
{
- if (creature instanceof ControllableAirShipInstance)
+ if ((creature instanceof ControllableAirShipInstance) && (_dockedShip == null))
{
- if (_dockedShip == null)
+ _dockedShip = (ControllableAirShipInstance) creature;
+ _dockedShip.setInDock(_dockZone);
+ _dockedShip.setOustLoc(_oustLoc);
+
+ // Ship is not empty - display movie to passengers and dock
+ if (!_dockedShip.isEmpty())
{
- _dockedShip = (ControllableAirShipInstance) creature;
- _dockedShip.setInDock(_dockZone);
- _dockedShip.setOustLoc(_oustLoc);
+ if (_movie != null)
+ {
+ playMovie(_dockedShip.getPassengers(), _movie);
+ }
- // Ship is not empty - display movie to passengers and dock
- if (!_dockedShip.isEmpty())
- {
- if (_movie != null)
- {
- playMovie(_dockedShip.getPassengers(), _movie);
- }
-
- ThreadPool.schedule(_decayTask, 1000);
- }
- else
- {
- _departSchedule = ThreadPool.schedule(_departTask, DEPART_INTERVAL);
- }
+ ThreadPool.schedule(_decayTask, 1000);
+ }
+ else
+ {
+ _departSchedule = ThreadPool.schedule(_departTask, DEPART_INTERVAL);
}
}
return null;
@@ -316,20 +313,17 @@ public abstract class AirShipController extends AbstractNpcAI
@Override
public String onExitZone(Creature creature, ZoneType zone)
{
- if (creature instanceof ControllableAirShipInstance)
+ if ((creature instanceof ControllableAirShipInstance) && creature.equals(_dockedShip))
{
- if (creature.equals(_dockedShip))
+ if (_departSchedule != null)
{
- if (_departSchedule != null)
- {
- _departSchedule.cancel(false);
- _departSchedule = null;
- }
-
- _dockedShip.setInDock(0);
- _dockedShip = null;
- _isBusy = false;
+ _departSchedule.cancel(false);
+ _departSchedule = null;
}
+
+ _dockedShip.setInDock(0);
+ _dockedShip = null;
+ _isBusy = false;
}
return null;
}
@@ -368,14 +362,11 @@ public abstract class AirShipController extends AbstractNpcAI
}
}
}
- if (_arrivalPath == null)
+ if ((_arrivalPath == null) && !ZoneManager.getInstance().getZoneById(_dockZone, ScriptZone.class).isInsideZone(_shipSpawnX, _shipSpawnY, _shipSpawnZ))
{
- if (!ZoneManager.getInstance().getZoneById(_dockZone, ScriptZone.class).isInsideZone(_shipSpawnX, _shipSpawnY, _shipSpawnZ))
- {
- LOGGER.log(Level.WARNING, getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled");
- _isBusy = true;
- return;
- }
+ LOGGER.log(Level.WARNING, getName() + ": Arrival path is null and spawn point not in zone " + _dockZone + ", controller disabled");
+ _isBusy = true;
+ return;
}
if (_departPath != null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index acd8c9a293..c97c6887ca 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Gracia/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -303,7 +303,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
}
catch (Exception e)
{
- e.printStackTrace();
+ LOGGER.warning(e.toString());
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Chimeras.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Chimeras.java
index 407f69246b..78d91ee118 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Chimeras.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Chimeras.java
@@ -84,36 +84,32 @@ public class Chimeras extends AbstractNpcAI
@Override
public String onSkillSee(Npc npc, PlayerInstance caster, Skill skill, WorldObject[] targets, boolean isSummon)
{
- if ((skill.getId() == BOTTLE) && !npc.isDead())
+ if (((skill.getId() == BOTTLE) && !npc.isDead()) //
+ && ((targets.length > 0) && (targets[0] == npc)) //
+ && (npc.getCurrentHp() < (npc.getMaxHp() * 0.1)))
{
- if ((targets.length > 0) && (targets[0] == npc))
+ if (HellboundEngine.getInstance().getLevel() == 7)
{
- if (npc.getCurrentHp() < (npc.getMaxHp() * 0.1))
+ HellboundEngine.getInstance().updateTrust(3, true);
+ }
+
+ npc.setIsDead(true);
+ if (npc.getId() == CELTUS)
+ {
+ npc.dropItem(caster, CONTAINED_LIFE_FORCE, CONTAINED_LIFE_FORCE_AMOUNT);
+ }
+ else
+ {
+ if (getRandom(100) < 80)
{
- if (HellboundEngine.getInstance().getLevel() == 7)
- {
- HellboundEngine.getInstance().updateTrust(3, true);
- }
-
- npc.setIsDead(true);
- if (npc.getId() == CELTUS)
- {
- npc.dropItem(caster, CONTAINED_LIFE_FORCE, CONTAINED_LIFE_FORCE_AMOUNT);
- }
- else
- {
- if (getRandom(100) < 80)
- {
- npc.dropItem(caster, DIM_LIFE_FORCE, 1);
- }
- else if (getRandom(100) < 80)
- {
- npc.dropItem(caster, LIFE_FORCE, 1);
- }
- }
- npc.onDecay();
+ npc.dropItem(caster, DIM_LIFE_FORCE, 1);
+ }
+ else if (getRandom(100) < 80)
+ {
+ npc.dropItem(caster, LIFE_FORCE, 1);
}
}
+ npc.onDecay();
}
return super.onSkillSee(npc, caster, skill, targets, isSummon);
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
index 14476acc54..1ff7451e39 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Bernarde/Bernarde.java
@@ -51,17 +51,16 @@ public class Bernarde extends AbstractNpcAI
{
case "HolyWater":
{
- if (HellboundEngine.getInstance().getLevel() == 2)
+ if ((HellboundEngine.getInstance().getLevel() == 2) //
+ && (player.getInventory().getInventoryItemCount(DARION_BADGE, -1, false) >= 5) //
+ && player.exchangeItemsById("Quest", npc, DARION_BADGE, 5, HOLY_WATER, 1, true))
{
- if (player.getInventory().getInventoryItemCount(DARION_BADGE, -1, false) >= 5)
- {
- if (player.exchangeItemsById("Quest", npc, DARION_BADGE, 5, HOLY_WATER, 1, true))
- {
- return "32300-02b.htm";
- }
- }
+ event = "32300-02b.htm";
+ }
+ else
+ {
+ event = "32300-02c.htm";
}
- event = "32300-02c.htm";
break;
}
case "Treasure":
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Buron/Buron.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Buron/Buron.java
index 7ef5d80b89..9fa981815f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Buron/Buron.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Buron/Buron.java
@@ -44,7 +44,7 @@ public class Buron extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
- String htmltext = event;
+ String htmltext;
if ("Rumor".equalsIgnoreCase(event))
{
htmltext = "32345-" + HellboundEngine.getInstance().getLevel() + "r.htm";
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Falk/Falk.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Falk/Falk.java
index 26c0356ab3..bb6385dc27 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Falk/Falk.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Falk/Falk.java
@@ -65,18 +65,15 @@ public class Falk extends AbstractNpcAI
@Override
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
- if (event.equalsIgnoreCase("badges"))
+ if (event.equalsIgnoreCase("badges") && !hasAtLeastOneQuestItem(player, BASIC_CERT, STANDART_CERT, PREMIUM_CERT))
{
- if (!hasAtLeastOneQuestItem(player, BASIC_CERT, STANDART_CERT, PREMIUM_CERT))
+ if (getQuestItemsCount(player, DARION_BADGE) >= 20)
{
- if (getQuestItemsCount(player, DARION_BADGE) >= 20)
- {
- takeItems(player, DARION_BADGE, 20);
- giveItems(player, BASIC_CERT, 1);
- return "32297-02a.htm";
- }
- return "32297-02b.htm";
+ takeItems(player, DARION_BADGE, 20);
+ giveItems(player, BASIC_CERT, 1);
+ return "32297-02a.htm";
}
+ return "32297-02b.htm";
}
return super.onAdvEvent(event, npc, player);
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Hude/Hude.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Hude/Hude.java
index ea351761d5..40c08a918c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Hude/Hude.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Hude/Hude.java
@@ -55,32 +55,26 @@ public class Hude extends AbstractNpcAI
{
case "scertif":
{
- if (HellboundEngine.getInstance().getLevel() > 3)
+ if ((HellboundEngine.getInstance().getLevel() > 3) && hasQuestItems(player, BASIC_CERT) && (getQuestItemsCount(player, MARK_OF_BETRAYAL) >= 30) && (getQuestItemsCount(player, STINGER) >= 60))
{
- if (hasQuestItems(player, BASIC_CERT) && (getQuestItemsCount(player, MARK_OF_BETRAYAL) >= 30) && (getQuestItemsCount(player, STINGER) >= 60))
- {
- takeItems(player, MARK_OF_BETRAYAL, 30);
- takeItems(player, STINGER, 60);
- takeItems(player, BASIC_CERT, 1);
- giveItems(player, STANDART_CERT, 1);
- return "32298-04a.htm";
- }
+ takeItems(player, MARK_OF_BETRAYAL, 30);
+ takeItems(player, STINGER, 60);
+ takeItems(player, BASIC_CERT, 1);
+ giveItems(player, STANDART_CERT, 1);
+ return "32298-04a.htm";
}
return "32298-04b.htm";
}
case "pcertif":
{
- if (HellboundEngine.getInstance().getLevel() > 6)
+ if ((HellboundEngine.getInstance().getLevel() > 6) && hasQuestItems(player, STANDART_CERT) && (getQuestItemsCount(player, LIFE_FORCE) >= 56) && (getQuestItemsCount(player, CONTAINED_LIFE_FORCE) >= 14))
{
- if (hasQuestItems(player, STANDART_CERT) && (getQuestItemsCount(player, LIFE_FORCE) >= 56) && (getQuestItemsCount(player, CONTAINED_LIFE_FORCE) >= 14))
- {
- takeItems(player, LIFE_FORCE, 56);
- takeItems(player, CONTAINED_LIFE_FORCE, 14);
- takeItems(player, STANDART_CERT, 1);
- giveItems(player, PREMIUM_CERT, 1);
- giveItems(player, MAP, 1);
- return "32298-06a.htm";
- }
+ takeItems(player, LIFE_FORCE, 56);
+ takeItems(player, CONTAINED_LIFE_FORCE, 14);
+ takeItems(player, STANDART_CERT, 1);
+ giveItems(player, PREMIUM_CERT, 1);
+ giveItems(player, MAP, 1);
+ return "32298-06a.htm";
}
return "32298-06b.htm";
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Jude/Jude.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Jude/Jude.java
index 667c49c456..c55d4a983e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Jude/Jude.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Jude/Jude.java
@@ -45,14 +45,11 @@ public class Jude extends AbstractNpcAI
{
if ("TreasureSacks".equalsIgnoreCase(event))
{
- if (HellboundEngine.getInstance().getLevel() == 3)
+ if ((HellboundEngine.getInstance().getLevel() == 3) && (getQuestItemsCount(player, NATIVE_TREASURE) >= 40))
{
- if (getQuestItemsCount(player, NATIVE_TREASURE) >= 40)
- {
- takeItems(player, NATIVE_TREASURE, 40);
- giveItems(player, RING_OF_WIND_MASTERY, 1);
- return "32356-02.htm";
- }
+ takeItems(player, NATIVE_TREASURE, 40);
+ giveItems(player, RING_OF_WIND_MASTERY, 1);
+ return "32356-02.htm";
}
return "32356-02a.htm";
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Quarry/Quarry.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Quarry/Quarry.java
index c2c32946ea..c07c2c7c01 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Quarry/Quarry.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Quarry/Quarry.java
@@ -164,23 +164,10 @@ public class Quarry extends AbstractNpcAI
if (creature.isAttackable())
{
final Attackable npc = (Attackable) creature;
- if (npc.getId() == SLAVE)
+ if ((npc.getId() == SLAVE) && !npc.isDead() && !npc.isDecayed() && (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_FOLLOW) && (HellboundEngine.getInstance().getLevel() == 5))
{
- if (!npc.isDead() && !npc.isDecayed() && (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_FOLLOW))
- {
- if (HellboundEngine.getInstance().getLevel() == 5)
- {
- startQuestTimer("DECAY", 1000, npc, null);
- try
- {
- npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THANK_YOU_FOR_THE_RESCUE_IT_S_A_SMALL_GIFT);
- }
- catch (Exception e)
- {
- //
- }
- }
- }
+ startQuestTimer("DECAY", 1000, npc, null);
+ npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.THANK_YOU_FOR_THE_RESCUE_IT_S_A_SMALL_GIFT);
}
}
return super.onEnterZone(creature, zone);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
index 7ee0f4f005..4e31faad2d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/NPC/Warpgate/Warpgate.java
@@ -120,9 +120,9 @@ public class Warpgate extends AbstractNpcAI
return true;
}
- final QuestState path_to_hellbound_st = player.getQuestState(Q00130_PathToHellbound.class.getSimpleName());
- final QuestState thats_bloody_hot_st = player.getQuestState(Q00133_ThatsBloodyHot.class.getSimpleName());
+ final QuestState qs1 = player.getQuestState(Q00130_PathToHellbound.class.getSimpleName());
+ final QuestState qs2 = player.getQuestState(Q00133_ThatsBloodyHot.class.getSimpleName());
- return (((path_to_hellbound_st != null) && path_to_hellbound_st.isCompleted()) || ((thats_bloody_hot_st != null) && thats_bloody_hot_st.isCompleted()));
+ return (((qs1 != null) && qs1.isCompleted()) || ((qs2 != null) && qs2.isCompleted()));
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java
index 45fbed2f5b..b6a3c1b1a5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java
@@ -60,8 +60,8 @@ public class AnomicFoundry extends AbstractNpcAI
//@formatter:on
private int respawnTime = 60000;
- private final int respawnMin = 20000;
- private final int respawnMax = 300000;
+ private final static int respawnMin = 20000;
+ private final static int respawnMax = 300000;
private final int[] _spawned =
{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
index e38bef8f2f..1f83fb8c1d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
@@ -21,6 +21,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
@@ -391,17 +392,14 @@ public class TowerOfNaia extends AbstractNpcAI
}
return "18492-01.htm";
}
- else if ((npcId >= ROOM_MANAGER_FIRST) && (npcId <= ROOM_MANAGER_LAST))
+ else if ((npcId >= ROOM_MANAGER_FIRST) && (npcId <= ROOM_MANAGER_LAST) && _activeRooms.containsKey(npcId) && !_activeRooms.get(npcId))
{
- if (_activeRooms.containsKey(npcId) && !_activeRooms.get(npcId))
+ if (player.getParty() == null)
{
- if (player.getParty() == null)
- {
- player.sendPacket(SystemMessageId.YOU_MUST_BE_IN_A_PARTY_IN_ORDER_TO_OPERATE_THE_MACHINE);
- return null;
- }
- return "manager.htm";
+ player.sendPacket(SystemMessageId.YOU_MUST_BE_IN_A_PARTY_IN_ORDER_TO_OPERATE_THE_MACHINE);
+ return null;
}
+ return "manager.htm";
}
return super.onFirstTalk(npc, player);
}
@@ -603,11 +601,11 @@ public class TowerOfNaia extends AbstractNpcAI
{
if (ZONES.containsValue(zone.getId()))
{
- for (int i : ZONES.keySet())
+ for (Entry entry : ZONES.entrySet())
{
- if (ZONES.get(i) == zone.getId())
+ if (entry.getValue() == zone.getId())
{
- managerId = i;
+ managerId = entry.getKey();
break;
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
index 7ef7706f9c..23d87c32cf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
@@ -923,7 +923,7 @@ public class TullyWorkshop extends AbstractNpcAI
}
else if (npcId == AGENT)
{
- if (event.equalsIgnoreCase("tele_to_7th_floor") && (allowAgentSpawn == false))
+ if (event.equalsIgnoreCase("tele_to_7th_floor") && !allowAgentSpawn)
{
htmltext = null;
final Party party = player.getParty();
@@ -969,7 +969,7 @@ public class TullyWorkshop extends AbstractNpcAI
}
}
}
- else if (event.equalsIgnoreCase("buff") && (allowAgentSpawn_7th == false))
+ else if (event.equalsIgnoreCase("buff") && !allowAgentSpawn_7th)
{
htmltext = null;
final Party party = player.getParty();
@@ -1003,7 +1003,7 @@ public class TullyWorkshop extends AbstractNpcAI
startQuestTimer("despawn_agent_7", 60000, npc, null);
}
}
- else if (event.equalsIgnoreCase("refuse") && (allowAgentSpawn_7th == false))
+ else if (event.equalsIgnoreCase("refuse") && !allowAgentSpawn_7th)
{
allowAgentSpawn_7th = true;
npc.deleteMe();
@@ -1124,22 +1124,16 @@ public class TullyWorkshop extends AbstractNpcAI
if ((actor != null) && !actor.isDead())
{
final double transferringHp = actor.getMaxHp() * 0.0001;
- if ((getRandom(10000) > 1500) && (victim1 != null) && !victim1.isDead())
+ if ((getRandom(10000) > 1500) && (victim1 != null) && !victim1.isDead() && ((actor.getCurrentHp() - transferringHp) > 1))
{
- if ((actor.getCurrentHp() - transferringHp) > 1)
- {
- actor.setCurrentHp(actor.getCurrentHp() - transferringHp);
- victim1.setCurrentHp(victim1.getCurrentHp() + transferringHp);
- }
+ actor.setCurrentHp(actor.getCurrentHp() - transferringHp);
+ victim1.setCurrentHp(victim1.getCurrentHp() + transferringHp);
}
- if ((getRandom(10000) > 3000) && (victim2 != null) && !victim2.isDead())
+ if ((getRandom(10000) > 3000) && (victim2 != null) && !victim2.isDead() && ((actor.getCurrentHp() - transferringHp) > 1))
{
- if ((actor.getCurrentHp() - transferringHp) > 1)
- {
- actor.setCurrentHp(actor.getCurrentHp() - transferringHp);
- victim2.setCurrentHp(victim2.getCurrentHp() + transferringHp);
- }
+ actor.setCurrentHp(actor.getCurrentHp() - transferringHp);
+ victim2.setCurrentHp(victim2.getCurrentHp() + transferringHp);
}
}
}
@@ -1196,7 +1190,7 @@ public class TullyWorkshop extends AbstractNpcAI
if ((npcId == TULLY) && npc.isInsideRadius2D(-12557, 273901, -9000, 1000))
{
- for (int i[] : POST_MORTEM_SPAWNLIST)
+ for (int[] i : POST_MORTEM_SPAWNLIST)
{
final Npc spawnedNpc = addSpawn(i[0], i[1], i[2], i[3], i[4], false, i[5], false);
postMortemSpawn.add(spawnedNpc);
@@ -1209,19 +1203,16 @@ public class TullyWorkshop extends AbstractNpcAI
_countdown = ThreadPool.scheduleAtFixedRate(() ->
{
countdownTime -= 10000;
- Npc _npc = null;
- if ((postMortemSpawn != null) && (postMortemSpawn.size() > 0))
+ Npc npcSpawn = null;
+ if ((postMortemSpawn != null) && !postMortemSpawn.isEmpty())
{
- _npc = postMortemSpawn.get(0);
+ npcSpawn = postMortemSpawn.get(0);
}
if (countdownTime > 60000)
{
- if ((countdownTime % 60000) == 0)
+ if (((countdownTime % 60000) == 0) && (npcSpawn != null) && (npcSpawn.getId() == INGENIOUS_CONTRAPTION))
{
- if ((_npc != null) && (_npc.getId() == INGENIOUS_CONTRAPTION))
- {
- _npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.S1_MINUTE_S_ARE_REMAINING, Integer.toString((countdownTime / 60000)));
- }
+ npcSpawn.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.S1_MINUTE_S_ARE_REMAINING, Integer.toString((countdownTime / 60000)));
}
}
else if (countdownTime <= 0)
@@ -1252,9 +1243,9 @@ public class TullyWorkshop extends AbstractNpcAI
}
else
{
- if ((_npc != null) && (_npc.getId() == INGENIOUS_CONTRAPTION))
+ if ((npcSpawn != null) && (npcSpawn.getId() == INGENIOUS_CONTRAPTION))
{
- _npc.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.S1_SECOND_S_REMAINING, Integer.toString((countdownTime / 1000)));
+ npcSpawn.broadcastSay(ChatType.NPC_SHOUT, NpcStringId.S1_SECOND_S_REMAINING, Integer.toString((countdownTime / 1000)));
}
}
}, 60000, 10000);
@@ -1268,7 +1259,7 @@ public class TullyWorkshop extends AbstractNpcAI
if (countdownTime > 180000)
{
countdownTime = Math.max(countdownTime - 180000, 60000);
- if ((postMortemSpawn != null) && (postMortemSpawn.size() > 0) && (postMortemSpawn.get(0) != null) && (postMortemSpawn.get(0).getId() == INGENIOUS_CONTRAPTION))
+ if ((postMortemSpawn != null) && !postMortemSpawn.isEmpty() && (postMortemSpawn.get(0) != null) && (postMortemSpawn.get(0).getId() == INGENIOUS_CONTRAPTION))
{
postMortemSpawn.get(0).broadcastSay(ChatType.NPC_SHOUT, NpcStringId.ZZZZ_CITY_INTERFERENCE_ERROR_FORWARD_EFFECT_CREATED);
}
@@ -1280,7 +1271,7 @@ public class TullyWorkshop extends AbstractNpcAI
if ((countdownTime > 0) && (countdownTime <= 420000))
{
countdownTime += 180000;
- if ((postMortemSpawn != null) && (postMortemSpawn.size() > 0) && (postMortemSpawn.get(0) != null) && (postMortemSpawn.get(0).getId() == INGENIOUS_CONTRAPTION))
+ if ((postMortemSpawn != null) && !postMortemSpawn.isEmpty() && (postMortemSpawn.get(0) != null) && (postMortemSpawn.get(0).getId() == INGENIOUS_CONTRAPTION))
{
postMortemSpawn.get(0).broadcastSay(ChatType.NPC_SHOUT, NpcStringId.ZZZZ_CITY_INTERFERENCE_ERROR_RECURRENCE_EFFECT_CREATED);
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java
index 26eea5bbe5..34a4f3183a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Hellbound/Instances/UrbanArea/UrbanArea.java
@@ -173,44 +173,41 @@ public class UrbanArea extends AbstractInstance
public String onAdvEvent(String event, Npc npc, PlayerInstance player)
{
final InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
- if (world != null)
+ if ((world != null) && (npc.getId() == DOWNTOWN_NATIVE))
{
- if (npc.getId() == DOWNTOWN_NATIVE)
+ if (event.equalsIgnoreCase("rebuff") && !world.getParameters().getBoolean("isAmaskariDead", false))
{
- if (event.equalsIgnoreCase("rebuff") && !world.getParameters().getBoolean("isAmaskariDead", false))
+ STONE.getSkill().applyEffects(npc, npc);
+ }
+ else if (event.equalsIgnoreCase("break_chains"))
+ {
+ if (!npc.isAffectedBySkill(STONE.getSkillId()) || world.getParameters().getBoolean("isAmaskariDead", false))
{
- STONE.getSkill().applyEffects(npc, npc);
+ npc.broadcastSay(ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[0]);
+ npc.broadcastSay(ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[2]);
}
- else if (event.equalsIgnoreCase("break_chains"))
+ else
{
- if (!npc.isAffectedBySkill(STONE.getSkillId()) || world.getParameters().getBoolean("isAmaskariDead", false))
+ cancelQuestTimer("rebuff", npc, null);
+ if (npc.isAffectedBySkill(STONE.getSkillId()))
{
- npc.broadcastSay(ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[0]);
- npc.broadcastSay(ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[2]);
+ npc.stopSkillEffects(false, STONE.getSkillId());
}
- else
+
+ npc.broadcastSay(ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[0]);
+ npc.broadcastSay(ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[1]);
+ HellboundEngine.getInstance().updateTrust(10, true);
+ npc.scheduleDespawn(3000);
+ // Try to call Amaskari
+ final Npc spawnedAmaskari = world.getParameters().getObject("spawnedAmaskari", Npc.class);
+ if ((spawnedAmaskari != null) && !spawnedAmaskari.isDead() && (getRandom(1000) < 25) && Util.checkIfInRange(5000, npc, spawnedAmaskari, false))
{
- cancelQuestTimer("rebuff", npc, null);
- if (npc.isAffectedBySkill(STONE.getSkillId()))
+ final ScheduledFuture activeAmaskariCall = world.getParameters().getObject("activeAmaskariCall", ScheduledFuture.class);
+ if (activeAmaskariCall != null)
{
- npc.stopSkillEffects(false, STONE.getSkillId());
- }
-
- npc.broadcastSay(ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[0]);
- npc.broadcastSay(ChatType.NPC_GENERAL, NATIVES_NPCSTRING_ID[1]);
- HellboundEngine.getInstance().updateTrust(10, true);
- npc.scheduleDespawn(3000);
- // Try to call Amaskari
- final Npc spawnedAmaskari = world.getParameters().getObject("spawnedAmaskari", Npc.class);
- if ((spawnedAmaskari != null) && !spawnedAmaskari.isDead() && (getRandom(1000) < 25) && Util.checkIfInRange(5000, npc, spawnedAmaskari, false))
- {
- final ScheduledFuture activeAmaskariCall = world.getParameters().getObject("activeAmaskariCall", ScheduledFuture.class);
- if (activeAmaskariCall != null)
- {
- activeAmaskariCall.cancel(true);
- }
- world.setParameter("activeAmaskariCall", ThreadPool.schedule(new CallAmaskari(npc), 25000));
+ activeAmaskariCall.cancel(true);
}
+ world.setParameter("activeAmaskariCall", ThreadPool.schedule(new CallAmaskari(npc), 25000));
}
}
}
@@ -240,23 +237,20 @@ public class UrbanArea extends AbstractInstance
public String onAggroRangeEnter(Npc npc, PlayerInstance player, boolean isSummon)
{
final InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
- if (world != null)
+ if ((world != null) && !npc.isBusy())
{
- if (!npc.isBusy())
+ npc.broadcastSay(ChatType.NPC_GENERAL, NPCSTRING_ID[0]);
+ npc.setBusy(true);
+
+ final Npc spawnedAmaskari = world.getParameters().getObject("spawnedAmaskari", Npc.class);
+ if ((spawnedAmaskari != null) && !spawnedAmaskari.isDead() && (getRandom(1000) < 25) && Util.checkIfInRange(1000, npc, spawnedAmaskari, false))
{
- npc.broadcastSay(ChatType.NPC_GENERAL, NPCSTRING_ID[0]);
- npc.setBusy(true);
-
- final Npc spawnedAmaskari = world.getParameters().getObject("spawnedAmaskari", Npc.class);
- if ((spawnedAmaskari != null) && !spawnedAmaskari.isDead() && (getRandom(1000) < 25) && Util.checkIfInRange(1000, npc, spawnedAmaskari, false))
+ final ScheduledFuture activeAmaskariCall = world.getParameters().getObject("activeAmaskariCall", ScheduledFuture.class);
+ if (activeAmaskariCall != null)
{
- final ScheduledFuture activeAmaskariCall = world.getParameters().getObject("activeAmaskariCall", ScheduledFuture.class);
- if (activeAmaskariCall != null)
- {
- activeAmaskariCall.cancel(true);
- }
- world.setParameter("activeAmaskariCall", ThreadPool.schedule(new CallAmaskari(npc), 25000));
+ activeAmaskariCall.cancel(true);
}
+ world.setParameter("activeAmaskariCall", ThreadPool.schedule(new CallAmaskari(npc), 25000));
}
}
return super.onAggroRangeEnter(npc, player, isSummon);
@@ -266,50 +260,47 @@ public class UrbanArea extends AbstractInstance
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon, Skill skill)
{
final InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
- if (world != null)
+ if ((world != null) && !world.getParameters().getBoolean("isAmaskariDead", false) && !(npc.getBusyMessage().equalsIgnoreCase("atk") || npc.isBusy()))
{
- if (!world.getParameters().getBoolean("isAmaskariDead", false) && !(npc.getBusyMessage().equalsIgnoreCase("atk") || npc.isBusy()))
+ int msgId;
+ int range;
+ switch (npc.getId())
{
- int msgId;
- int range;
- switch (npc.getId())
+ case TOWN_GUARD:
{
- case TOWN_GUARD:
- {
- msgId = 0;
- range = 1000;
- break;
- }
- case KEYMASTER:
- {
- msgId = 1;
- range = 5000;
- break;
- }
- default:
- {
- msgId = -1;
- range = 0;
- }
+ msgId = 0;
+ range = 1000;
+ break;
}
- if (msgId >= 0)
+ case KEYMASTER:
{
- npc.broadcastSay(ChatType.NPC_GENERAL, NPCSTRING_ID[msgId], range);
+ msgId = 1;
+ range = 5000;
+ break;
}
- npc.setBusy(true);
- npc.setBusyMessage("atk");
-
- final Npc spawnedAmaskari = world.getParameters().getObject("spawnedAmaskari", Npc.class);
- if ((spawnedAmaskari != null) && !spawnedAmaskari.isDead() && (getRandom(1000) < 25) && Util.checkIfInRange(range, npc, spawnedAmaskari, false))
+ default:
{
- final ScheduledFuture activeAmaskariCall = world.getParameters().getObject("activeAmaskariCall", ScheduledFuture.class);
- if (activeAmaskariCall != null)
- {
- activeAmaskariCall.cancel(true);
- }
- world.setParameter("activeAmaskariCall", ThreadPool.schedule(new CallAmaskari(npc), 25000));
+ msgId = -1;
+ range = 0;
}
}
+ if (msgId >= 0)
+ {
+ npc.broadcastSay(ChatType.NPC_GENERAL, NPCSTRING_ID[msgId], range);
+ }
+ npc.setBusy(true);
+ npc.setBusyMessage("atk");
+
+ final Npc spawnedAmaskari = world.getParameters().getObject("spawnedAmaskari", Npc.class);
+ if ((spawnedAmaskari != null) && !spawnedAmaskari.isDead() && (getRandom(1000) < 25) && Util.checkIfInRange(range, npc, spawnedAmaskari, false))
+ {
+ final ScheduledFuture activeAmaskariCall = world.getParameters().getObject("activeAmaskariCall", ScheduledFuture.class);
+ if (activeAmaskariCall != null)
+ {
+ activeAmaskariCall.cancel(true);
+ }
+ world.setParameter("activeAmaskariCall", ThreadPool.schedule(new CallAmaskari(npc), 25000));
+ }
}
return super.onAttack(npc, attacker, damage, isSummon, skill);
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
index 486d72d842..2b2d885f8e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/KetraOrcOutpust/KetraOrcSupport/KetraOrcSupport.java
@@ -235,7 +235,7 @@ public class KetraOrcSupport extends AbstractNpcAI
return htmltext;
}
- public static void main(String args[])
+ public static void main(String[] args)
{
new KetraOrcSupport();
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java
index 944cacfed9..d7a5250213 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java
@@ -33,7 +33,7 @@ import ai.AbstractNpcAI;
*/
public class PlainsOfDion extends AbstractNpcAI
{
- private static final int DELU_LIZARDMEN[] =
+ private static final int[] DELU_LIZARDMEN =
{
21104, // Delu Lizardman Supplier
21105, // Delu Lizardman Special Agent
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
index 41e13f19f2..d5884ea7b8 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
@@ -283,13 +283,10 @@ public class PrimevalIsle extends AbstractNpcAI
npc.doCast(physicalSpecial1.getSkill());
}
}
- else if (getRandom(100) <= (probPhysicalSpecial2 * npc.getVariables().getInt("SKILL_MULTIPLER")))
+ else if ((getRandom(100) <= (probPhysicalSpecial2 * npc.getVariables().getInt("SKILL_MULTIPLER"))) && !npc.isSkillDisabled(physicalSpecial2.getSkill()))
{
- if (!npc.isSkillDisabled(physicalSpecial2.getSkill()))
- {
- npc.setTarget(creature);
- npc.doCast(physicalSpecial2.getSkill());
- }
+ npc.setTarget(creature);
+ npc.doCast(physicalSpecial2.getSkill());
}
}
}
@@ -349,20 +346,14 @@ public class PrimevalIsle extends AbstractNpcAI
npc.doCast(SELFBUFF1.getSkill());
}
}
- else if (npc.isScriptValue(1))
+ else if (npc.isScriptValue(1) && !npc.isSkillDisabled(SELFBUFF2.getSkill()))
{
- if (!npc.isSkillDisabled(SELFBUFF2.getSkill()))
- {
- npc.doCast(SELFBUFF2.getSkill());
- }
+ npc.doCast(SELFBUFF2.getSkill());
}
}
- else if ((((npc.getCurrentHp() / npc.getMaxHp()) * 100) <= 60) && (npc.isScriptValue(3)))
+ else if ((((npc.getCurrentHp() / npc.getMaxHp()) * 100) <= 60) && (npc.isScriptValue(3)) && !npc.isSkillDisabled(SELFBUFF1.getSkill()))
{
- if (!npc.isSkillDisabled(SELFBUFF1.getSkill()))
- {
- npc.doCast(SELFBUFF1.getSkill());
- }
+ npc.doCast(SELFBUFF1.getSkill());
}
if (Util.calculateDistance(npc, attacker, true, false) > 100)
@@ -431,21 +422,15 @@ public class PrimevalIsle extends AbstractNpcAI
if (target != null)
{
- if (getRandom(100) <= (probPhysicalSpecial1 * npc.getVariables().getInt("SKILL_MULTIPLER")))
+ if ((getRandom(100) <= (probPhysicalSpecial1 * npc.getVariables().getInt("SKILL_MULTIPLER"))) && !npc.isSkillDisabled(physicalSpecial1.getSkill()))
{
- if (!npc.isSkillDisabled(physicalSpecial1.getSkill()))
- {
- npc.setTarget(target);
- npc.doCast(physicalSpecial1.getSkill());
- }
+ npc.setTarget(target);
+ npc.doCast(physicalSpecial1.getSkill());
}
- if (getRandom(100) <= (probPhysicalSpecial2 * npc.getVariables().getInt("SKILL_MULTIPLER")))
+ if ((getRandom(100) <= (probPhysicalSpecial2 * npc.getVariables().getInt("SKILL_MULTIPLER"))) && !npc.isSkillDisabled(physicalSpecial2.getSkill()))
{
- if (!npc.isSkillDisabled(physicalSpecial2.getSkill()))
- {
- npc.setTarget(target);
- npc.doCast(physicalSpecial2.getSkill());
- }
+ npc.setTarget(target);
+ npc.doCast(physicalSpecial2.getSkill());
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
index d662e89ffc..53dc04d400 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/Rune/RuneCastle/Venom/Venom.java
@@ -243,7 +243,7 @@ public class Venom extends AbstractNpcAI
{
teleportTarget(player);
((Attackable) npc).stopHating(player);
- if ((_targets != null) && (_targets.size() > 0))
+ if ((_targets != null) && !_targets.isEmpty())
{
for (PlayerInstance target : _targets)
{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
index 4dcd55590a..c46b24b16e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -89,25 +89,21 @@ public class StakatoNest extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon)
{
- final MonsterInstance mob = (MonsterInstance) npc;
-
- if ((mob.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (mob.getCurrentHp() < (mob.getMaxHp() * 0.3)))
+ if ((npc.getId() == STAKATO_LEADER) && (getRandom(1000) < 100) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.3)))
{
- final MonsterInstance _follower = checkMinion(npc);
-
- if (_follower != null)
+ final MonsterInstance follower = checkMinion(npc);
+ if (follower != null)
{
- final double _hp = _follower.getCurrentHp();
-
- if (_hp > (_follower.getMaxHp() * 0.3))
+ final double hp = follower.getCurrentHp();
+ if (hp > (follower.getMaxHp() * 0.3))
{
- mob.abortAttack();
- mob.abortCast();
- mob.setHeading(Util.calculateHeadingFrom(mob, _follower));
- mob.doCast(SkillData.getInstance().getSkill(4484, 1));
- mob.setCurrentHp(mob.getCurrentHp() + _hp);
- _follower.doDie(_follower);
- _follower.deleteMe();
+ npc.abortAttack();
+ npc.abortCast();
+ npc.setHeading(Util.calculateHeadingFrom(npc, follower));
+ npc.doCast(SkillData.getInstance().getSkill(4484, 1));
+ npc.setCurrentHp(npc.getCurrentHp() + hp);
+ follower.doDie(follower);
+ follower.deleteMe();
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
index d9de690459..9283be51cf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/areas/VarkaSilenosBarracks/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -235,7 +235,7 @@ public class VarkaSilenosSupport extends AbstractNpcAI
return htmltext;
}
- public static void main(String args[])
+ public static void main(String[] args)
{
new VarkaSilenosSupport();
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java
index 146fe579f0..e09c3d5c9a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Baium/Baium.java
@@ -777,11 +777,11 @@ public class Baium extends AbstractNpcAI
private PlayerInstance getRandomPlayer(Npc npc)
{
- for (Creature creature : World.getInstance().getVisibleObjectsInRange(npc, PlayerInstance.class, 2000))
+ for (PlayerInstance player : World.getInstance().getVisibleObjectsInRange(npc, PlayerInstance.class, 2000))
{
- if ((creature != null) && zone.isInsideZone(creature) && !creature.isDead())
+ if ((player != null) && zone.isInsideZone(player) && !player.isDead())
{
- return (PlayerInstance) creature;
+ return player;
}
}
return null;
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java
index 92e22984dd..53ed3be92b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Core/Core.java
@@ -162,7 +162,7 @@ public class Core extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("despawn_minions"))
{
- _minions.forEach(m -> m.decayMe());
+ _minions.forEach(Attackable::decayMe);
_minions.clear();
}
return super.onAdvEvent(event, npc, player);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
index 6f155887fe..5a0d74c1b4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/DrChaos/DrChaos.java
@@ -95,14 +95,12 @@ public class DrChaos extends AbstractNpcAI
final GrandBossInstance golem = (GrandBossInstance) addSpawn(CHAOS_GOLEM, loc_x, loc_y, loc_z, heading, false, 0, false);
GrandBossManager.getInstance().addBoss(golem);
- final Npc _golem = golem;
-
- _golem.setCurrentHpMp(hp, mp);
- _golem.setRunning();
+ golem.setCurrentHpMp(hp, mp);
+ golem.setRunning();
// start monitoring Dr. Chaos's inactivity
_lastAttackVsGolem = System.currentTimeMillis();
- startQuestTimer("golem_despawn", 60000, _golem, null, true);
+ startQuestTimer("golem_despawn", 60000, golem, null, true);
}
// Spawn the regular NPC.
else
@@ -122,17 +120,14 @@ public class DrChaos extends AbstractNpcAI
// despawn the live Dr. Chaos after 30 minutes of inactivity
else if (event.equalsIgnoreCase("golem_despawn") && (npc != null))
{
- if (npc.getId() == CHAOS_GOLEM)
+ if ((npc.getId() == CHAOS_GOLEM) && ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis()))
{
- if ((_lastAttackVsGolem + 1800000) < System.currentTimeMillis())
- {
- // Despawn the war golem.
- npc.deleteMe();
-
- addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false); // spawn Dr. Chaos
- GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
- cancelQuestTimer("golem_despawn", npc, null);
- }
+ // Despawn the war golem.
+ npc.deleteMe();
+
+ addSpawn(DOCTOR_CHAOS, 96320, -110912, -3328, 8191, false, 0, false); // spawn Dr. Chaos
+ GrandBossManager.getInstance().setBossStatus(CHAOS_GOLEM, NORMAL); // mark Dr. Chaos is not crazy any more
+ cancelQuestTimer("golem_despawn", npc, null);
}
}
else if (event.equalsIgnoreCase("1"))
@@ -171,30 +166,27 @@ public class DrChaos extends AbstractNpcAI
startQuestTimer("golem_despawn", 60000, npc, null, true);
}
// Check every sec if someone is in range, if found, launch one task to decrease the timer.
- else if (event.equalsIgnoreCase("paranoia_activity"))
+ else if (event.equalsIgnoreCase("paranoia_activity") && (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL))
{
- if (GrandBossManager.getInstance().getBossStatus(CHAOS_GOLEM) == NORMAL)
+ for (PlayerInstance obj : World.getInstance().getVisibleObjectsInRange(npc, PlayerInstance.class, 500))
{
- for (PlayerInstance obj : World.getInstance().getVisibleObjectsInRange(npc, PlayerInstance.class, 500))
+ if (obj.isDead())
{
- if (obj.isDead())
- {
- continue;
- }
-
- _pissedOffTimer -= 1;
-
- // Make him speak.
- if (_pissedOffTimer == 15)
- {
- npc.broadcastSay(ChatType.NPC_GENERAL, "How dare you trespass into my territory! Have you no fear?");
- }
-
- // That was "too much" for that time.
- if (_pissedOffTimer <= 0)
- {
- crazyMidgetBecomesAngry(npc);
- }
+ continue;
+ }
+
+ _pissedOffTimer -= 1;
+
+ // Make him speak.
+ if (_pissedOffTimer == 15)
+ {
+ npc.broadcastSay(ChatType.NPC_GENERAL, "How dare you trespass into my territory! Have you no fear?");
+ }
+
+ // That was "too much" for that time.
+ if (_pissedOffTimer <= 0)
+ {
+ crazyMidgetBecomesAngry(npc);
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
index 98c0579e36..a3577ea038 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Frintezza/Frintezza.java
@@ -231,37 +231,35 @@ public class Frintezza extends AbstractNpcAI
private static final byte FIGHTING = 2; // Frintezza is engaged in battle, annihilating his foes. Entry is locked
private static final byte DEAD = 3; // Frintezza has been killed. Entry is locked
- private static long _LastAction = 0;
- private static int _Angle = 0;
- private static int _Heading = 0;
- private static int _LocCycle = 0;
- private static int _Bomber = 0;
- private static int _CheckDie = 0;
- private static int _OnCheck = 0;
- private static int _OnSong = 0;
- private static int _Abnormal = 0;
- private static int _OnMorph = 0;
- private static int _Scarlet_x = 0;
- private static int _Scarlet_y = 0;
- private static int _Scarlet_z = 0;
- private static int _Scarlet_h = 0;
- private static int _SecondMorph = 0;
- private static int _ThirdMorph = 0;
- private static int _KillHallAlarmDevice = 0;
- private static int _KillDarkChoirPlayer = 0;
- private static int _KillDarkChoirCaptain = 0;
+ private static long _lastAction = 0;
+ private static int _angle = 0;
+ private static int _locCycle = 0;
+ private static int _bomber = 0;
+ private static int _checkDie = 0;
+ private static int _onCheck = 0;
+ private static int _onSong = 0;
+ private static int _abnormal = 0;
+ private static int _onMorph = 0;
+ private static int _scarletX = 0;
+ private static int _scarletY = 0;
+ private static int _scarletZ = 0;
+ private static int _scarletH = 0;
+ private static int _secondMorph = 0;
+ private static int _thirdMorph = 0;
+ private static int _killHallAlarmDevice = 0;
+ private static int _killDarkChoirPlayer = 0;
+ private static int _killDarkChoirCaptain = 0;
- private static BossZone _Zone;
- private GrandBossInstance frintezza, weakScarlet, strongScarlet, activeScarlet;
- private MonsterInstance demon1, demon2, demon3, demon4, portrait1, portrait2, portrait3, portrait4;
+ private static BossZone _zone;
+ private GrandBossInstance _frintezza, _weakScarlet, _strongScarlet, _activeScarlet;
+ private MonsterInstance _demon1, _demon2, _demon3, _demon4, _portrait1, _portrait2, _portrait3, _portrait4;
private Npc _frintezzaDummy, _overheadDummy, _portraitDummy1, _portraitDummy3, _scarletDummy;
- private static List _PlayersInside = new CopyOnWriteArrayList<>();
- private static List _Room1Mobs = new CopyOnWriteArrayList<>();
- private static List _Room2Mobs = new CopyOnWriteArrayList<>();
- private static List Minions = new CopyOnWriteArrayList<>();
+ private static List _playersInside = new CopyOnWriteArrayList<>();
+ private static List _room1Mobs = new CopyOnWriteArrayList<>();
+ private static List _room2Mobs = new CopyOnWriteArrayList<>();
+ private static List _minions = new CopyOnWriteArrayList<>();
- // Boss: Frintezza
- public Frintezza(int id, String name, String descr)
+ private Frintezza()
{
int[] mob =
{
@@ -285,7 +283,7 @@ public class Frintezza extends AbstractNpcAI
29050,
29051
};
- _Zone = GrandBossManager.getInstance().getZone(174232, -88020, -5116);
+ _zone = GrandBossManager.getInstance().getZone(174232, -88020, -5116);
registerMobs(mob);
addStartNpc(GUIDE);
addTalkId(GUIDE);
@@ -314,7 +312,6 @@ public class Frintezza extends AbstractNpcAI
for (int i = 0; i < 8; i++)
{
// DoorData.getInstance().getDoor(25150051+i).setRange(0, 0, 0, 0, 0, 0)
- // TODO:
DoorData.getInstance().getDoor(25150051 + i).setTargetable(false);
}
}
@@ -327,14 +324,14 @@ public class Frintezza extends AbstractNpcAI
{
startQuestTimer("close", 27000, npc, null);
startQuestTimer("camera_1", 30000, npc, null);
- _Zone.broadcastPacket(new Earthquake(174232, -88020, -5116, 45, 27));
+ _zone.broadcastPacket(new Earthquake(174232, -88020, -5116, 45, 27));
}
else if (event.equalsIgnoreCase("room1_spawn"))
{
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);
- _Room1Mobs.add(mob);
+ _room1Mobs.add(mob);
}
}
else if (event.equalsIgnoreCase("room1_spawn2"))
@@ -342,7 +339,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);
- _Room1Mobs.add(mob);
+ _room1Mobs.add(mob);
}
}
else if (event.equalsIgnoreCase("room1_spawn3"))
@@ -350,7 +347,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);
- _Room1Mobs.add(mob);
+ _room1Mobs.add(mob);
}
}
else if (event.equalsIgnoreCase("room1_spawn4"))
@@ -358,7 +355,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);
- _Room1Mobs.add(mob);
+ _room1Mobs.add(mob);
}
}
else if (event.equalsIgnoreCase("room2_spawn"))
@@ -366,7 +363,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);
- _Room2Mobs.add(mob);
+ _room2Mobs.add(mob);
}
}
else if (event.equalsIgnoreCase("room2_spawn2"))
@@ -374,105 +371,105 @@ 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);
- _Room2Mobs.add(mob);
+ _room2Mobs.add(mob);
}
}
else if (event.equalsIgnoreCase("room1_del"))
{
- for (Npc mob : _Room1Mobs)
+ for (Npc mob : _room1Mobs)
{
if (mob != null)
{
mob.deleteMe();
}
}
- _Room1Mobs.clear();
+ _room1Mobs.clear();
}
else if (event.equalsIgnoreCase("room2_del"))
{
- for (Npc mob : _Room2Mobs)
+ for (Npc mob : _room2Mobs)
{
if (mob != null)
{
mob.deleteMe();
}
}
- _Room2Mobs.clear();
+ _room2Mobs.clear();
}
else if (event.equalsIgnoreCase("room3_del"))
{
- if (demon1 != null)
+ if (_demon1 != null)
{
- demon1.deleteMe();
+ _demon1.deleteMe();
}
- if (demon2 != null)
+ if (_demon2 != null)
{
- demon2.deleteMe();
+ _demon2.deleteMe();
}
- if (demon3 != null)
+ if (_demon3 != null)
{
- demon3.deleteMe();
+ _demon3.deleteMe();
}
- if (demon4 != null)
+ if (_demon4 != null)
{
- demon4.deleteMe();
+ _demon4.deleteMe();
}
- if (portrait1 != null)
+ if (_portrait1 != null)
{
- portrait1.deleteMe();
+ _portrait1.deleteMe();
}
- if (portrait2 != null)
+ if (_portrait2 != null)
{
- portrait2.deleteMe();
+ _portrait2.deleteMe();
}
- if (portrait3 != null)
+ if (_portrait3 != null)
{
- portrait3.deleteMe();
+ _portrait3.deleteMe();
}
- if (portrait4 != null)
+ if (_portrait4 != null)
{
- portrait4.deleteMe();
+ _portrait4.deleteMe();
}
- if (frintezza != null)
+ if (_frintezza != null)
{
- frintezza.deleteMe();
+ _frintezza.deleteMe();
}
- if (weakScarlet != null)
+ if (_weakScarlet != null)
{
- weakScarlet.deleteMe();
+ _weakScarlet.deleteMe();
}
- if (strongScarlet != null)
+ if (_strongScarlet != null)
{
- strongScarlet.deleteMe();
+ _strongScarlet.deleteMe();
}
- demon1 = null;
- demon2 = null;
- demon3 = null;
- demon4 = null;
- portrait1 = null;
- portrait2 = null;
- portrait3 = null;
- portrait4 = null;
- frintezza = null;
- weakScarlet = null;
- strongScarlet = null;
- activeScarlet = null;
+ _demon1 = null;
+ _demon2 = null;
+ _demon3 = null;
+ _demon4 = null;
+ _portrait1 = null;
+ _portrait2 = null;
+ _portrait3 = null;
+ _portrait4 = null;
+ _frintezza = null;
+ _weakScarlet = null;
+ _strongScarlet = null;
+ _activeScarlet = null;
}
else if (event.equalsIgnoreCase("clean"))
{
- _LastAction = 0;
- _LocCycle = 0;
- _CheckDie = 0;
- _OnCheck = 0;
- _Abnormal = 0;
- _OnMorph = 0;
- _SecondMorph = 0;
- _ThirdMorph = 0;
- _KillHallAlarmDevice = 0;
- _KillDarkChoirPlayer = 0;
- _KillDarkChoirCaptain = 0;
- _PlayersInside.clear();
+ _lastAction = 0;
+ _locCycle = 0;
+ _checkDie = 0;
+ _onCheck = 0;
+ _abnormal = 0;
+ _onMorph = 0;
+ _secondMorph = 0;
+ _thirdMorph = 0;
+ _killHallAlarmDevice = 0;
+ _killDarkChoirPlayer = 0;
+ _killDarkChoirCaptain = 0;
+ _playersInside.clear();
}
else if (event.equalsIgnoreCase("close"))
{
@@ -494,7 +491,7 @@ public class Frintezza extends AbstractNpcAI
{
if (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING)
{
- if (!_Zone.isInsideZone(npc))
+ if (!_zone.isInsideZone(npc))
{
npc.teleToLocation(174232, -88020, -5116);
}
@@ -535,90 +532,90 @@ public class Frintezza extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("camera_2"))
{
- _Zone.broadcastPacket(new SpecialCamera(_overheadDummy, 0, 75, -89, 0, 100, 0, 0, 1, 0, 0));
+ _zone.broadcastPacket(new SpecialCamera(_overheadDummy, 0, 75, -89, 0, 100, 0, 0, 1, 0, 0));
startQuestTimer("camera_2b", 0, _overheadDummy, null);
}
else if (event.equalsIgnoreCase("camera_2b"))
{
- _Zone.broadcastPacket(new SpecialCamera(_overheadDummy, 0, 75, -89, 0, 100, 0, 0, 1, 0, 0));
+ _zone.broadcastPacket(new SpecialCamera(_overheadDummy, 0, 75, -89, 0, 100, 0, 0, 1, 0, 0));
startQuestTimer("camera_3", 0, _overheadDummy, null);
}
else if (event.equalsIgnoreCase("camera_3"))
{
- _Zone.broadcastPacket(new SpecialCamera(_overheadDummy, 300, 90, -10, 6500, 7000, 0, 0, 1, 0, 0));
+ _zone.broadcastPacket(new SpecialCamera(_overheadDummy, 300, 90, -10, 6500, 7000, 0, 0, 1, 0, 0));
- frintezza = (GrandBossInstance) addSpawn(FRINTEZZA, 174240, -89805, -5022, 16048, false, 0);
- GrandBossManager.getInstance().addBoss(frintezza);
- frintezza.setIsImmobilized(true);
- frintezza.setIsInvul(true);
- frintezza.disableAllSkills();
+ _frintezza = (GrandBossInstance) addSpawn(FRINTEZZA, 174240, -89805, -5022, 16048, false, 0);
+ GrandBossManager.getInstance().addBoss(_frintezza);
+ _frintezza.setIsImmobilized(true);
+ _frintezza.setIsInvul(true);
+ _frintezza.disableAllSkills();
// _Zone.updateKnownList(frintezza);
- demon2 = (MonsterInstance) addSpawn(29051, 175876, -88713, -5100, 28205, false, 0);
- demon2.setIsImmobilized(true);
- demon2.disableAllSkills();
+ _demon2 = (MonsterInstance) addSpawn(29051, 175876, -88713, -5100, 28205, false, 0);
+ _demon2.setIsImmobilized(true);
+ _demon2.disableAllSkills();
// _Zone.updateKnownList(demon2);
- demon3 = (MonsterInstance) addSpawn(29051, 172608, -88702, -5100, 64817, false, 0);
- demon3.setIsImmobilized(true);
- demon3.disableAllSkills();
+ _demon3 = (MonsterInstance) addSpawn(29051, 172608, -88702, -5100, 64817, false, 0);
+ _demon3.setIsImmobilized(true);
+ _demon3.disableAllSkills();
// _Zone.updateKnownList(demon3);
- demon1 = (MonsterInstance) addSpawn(29050, 175833, -87165, -5100, 35048, false, 0);
- demon1.setIsImmobilized(true);
- demon1.disableAllSkills();
+ _demon1 = (MonsterInstance) addSpawn(29050, 175833, -87165, -5100, 35048, false, 0);
+ _demon1.setIsImmobilized(true);
+ _demon1.disableAllSkills();
// _Zone.updateKnownList(demon1);
- demon4 = (MonsterInstance) addSpawn(29050, 172634, -87165, -5100, 57730, false, 0);
- demon4.setIsImmobilized(true);
- demon4.disableAllSkills();
+ _demon4 = (MonsterInstance) addSpawn(29050, 172634, -87165, -5100, 57730, false, 0);
+ _demon4.setIsImmobilized(true);
+ _demon4.disableAllSkills();
// _Zone.updateKnownList(demon4);
startQuestTimer("camera_4", 6500, _overheadDummy, null);
}
else if (event.equalsIgnoreCase("camera_4"))
{
- _Zone.broadcastPacket(new SpecialCamera(_frintezzaDummy, 1800, 90, 8, 6500, 7000, 0, 0, 1, 0, 0));
+ _zone.broadcastPacket(new SpecialCamera(_frintezzaDummy, 1800, 90, 8, 6500, 7000, 0, 0, 1, 0, 0));
startQuestTimer("camera_5", 900, _frintezzaDummy, null);
}
else if (event.equalsIgnoreCase("camera_5"))
{
- _Zone.broadcastPacket(new SpecialCamera(_frintezzaDummy, 140, 90, 10, 2500, 4500, 0, 0, 1, 0, 0));
+ _zone.broadcastPacket(new SpecialCamera(_frintezzaDummy, 140, 90, 10, 2500, 4500, 0, 0, 1, 0, 0));
startQuestTimer("camera_5b", 4000, _frintezzaDummy, null);
}
else if (event.equalsIgnoreCase("camera_5b"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 40, 75, -10, 0, 1000, 0, 0, 1, 0, 0));
- startQuestTimer("camera_6", 0, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 40, 75, -10, 0, 1000, 0, 0, 1, 0, 0));
+ startQuestTimer("camera_6", 0, _frintezza, null);
}
else if (event.equalsIgnoreCase("camera_6"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 40, 75, -10, 0, 12000, 0, 0, 1, 0, 0));
- startQuestTimer("camera_7", 1350, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 40, 75, -10, 0, 12000, 0, 0, 1, 0, 0));
+ startQuestTimer("camera_7", 1350, _frintezza, null);
}
else if (event.equalsIgnoreCase("camera_7"))
{
- _Zone.broadcastPacket(new SocialAction(frintezza.getObjectId(), 2));
- startQuestTimer("camera_8", 7000, frintezza, null);
+ _zone.broadcastPacket(new SocialAction(_frintezza.getObjectId(), 2));
+ startQuestTimer("camera_8", 7000, _frintezza, null);
}
else if (event.equalsIgnoreCase("camera_8"))
{
- startQuestTimer("camera_9", 1000, frintezza, null);
+ startQuestTimer("camera_9", 1000, _frintezza, null);
_frintezzaDummy.deleteMe();
_frintezzaDummy = null;
}
else if (event.equalsIgnoreCase("camera_9"))
{
- _Zone.broadcastPacket(new SocialAction(demon2.getObjectId(), 1));
- _Zone.broadcastPacket(new SocialAction(demon3.getObjectId(), 1));
- startQuestTimer("camera_9b", 400, frintezza, null);
+ _zone.broadcastPacket(new SocialAction(_demon2.getObjectId(), 1));
+ _zone.broadcastPacket(new SocialAction(_demon3.getObjectId(), 1));
+ startQuestTimer("camera_9b", 400, _frintezza, null);
}
else if (event.equalsIgnoreCase("camera_9b"))
{
- _Zone.broadcastPacket(new SocialAction(demon1.getObjectId(), 1));
- _Zone.broadcastPacket(new SocialAction(demon4.getObjectId(), 1));
+ _zone.broadcastPacket(new SocialAction(_demon1.getObjectId(), 1));
+ _zone.broadcastPacket(new SocialAction(_demon4.getObjectId(), 1));
- for (Creature pc : _Zone.getCharactersInside())
+ for (Creature pc : _zone.getCharactersInside())
{
if (pc.isPlayer())
{
@@ -632,11 +629,11 @@ public class Frintezza extends AbstractNpcAI
}
}
}
- startQuestTimer("camera_9c", 0, frintezza, null);
+ startQuestTimer("camera_9c", 0, _frintezza, null);
}
else if (event.equalsIgnoreCase("camera_9c"))
{
- for (Creature pc : _Zone.getCharactersInside())
+ for (Creature pc : _zone.getCharactersInside())
{
if (pc instanceof PlayerInstance)
{
@@ -650,109 +647,109 @@ public class Frintezza extends AbstractNpcAI
}
}
}
- startQuestTimer("camera_10", 2000, frintezza, null);
+ startQuestTimer("camera_10", 2000, _frintezza, null);
}
else if (event.equalsIgnoreCase("camera_10"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 240, 90, 0, 0, 1000, 0, 0, 1, 0, 0));
- startQuestTimer("camera_11", 0, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 240, 90, 0, 0, 1000, 0, 0, 1, 0, 0));
+ startQuestTimer("camera_11", 0, _frintezza, null);
}
else if (event.equalsIgnoreCase("camera_11"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 240, 90, 25, 5500, 10000, 0, 0, 1, 0, 0));
- _Zone.broadcastPacket(new SocialAction(frintezza.getObjectId(), 3));
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 240, 90, 25, 5500, 10000, 0, 0, 1, 0, 0));
+ _zone.broadcastPacket(new SocialAction(_frintezza.getObjectId(), 3));
_portraitDummy1.deleteMe();
_portraitDummy3.deleteMe();
_portraitDummy1 = null;
_portraitDummy3 = null;
- startQuestTimer("camera_12", 4500, frintezza, null);
+ startQuestTimer("camera_12", 4500, _frintezza, null);
}
else if (event.equalsIgnoreCase("camera_12"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 100, 195, 35, 0, 10000, 0, 0, 1, 0, 0));
- startQuestTimer("camera_13", 700, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 100, 195, 35, 0, 10000, 0, 0, 1, 0, 0));
+ startQuestTimer("camera_13", 700, _frintezza, null);
}
else if (event.equalsIgnoreCase("camera_13"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 100, 195, 35, 0, 10000, 0, 0, 1, 0, 0));
- startQuestTimer("camera_14", 1300, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 100, 195, 35, 0, 10000, 0, 0, 1, 0, 0));
+ startQuestTimer("camera_14", 1300, _frintezza, null);
}
else if (event.equalsIgnoreCase("camera_14"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 120, 180, 45, 1500, 10000, 0, 0, 1, 0, 0));
- _Zone.broadcastPacket(new MagicSkillUse(frintezza, frintezza, 5006, 1, 34000, 0));
- startQuestTimer("camera_16", 1500, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 120, 180, 45, 1500, 10000, 0, 0, 1, 0, 0));
+ _zone.broadcastPacket(new MagicSkillUse(_frintezza, _frintezza, 5006, 1, 34000, 0));
+ startQuestTimer("camera_16", 1500, _frintezza, null);
}
else if (event.equalsIgnoreCase("camera_16"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 520, 135, 45, 8000, 10000, 0, 0, 1, 0, 0));
- startQuestTimer("camera_17", 7500, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 520, 135, 45, 8000, 10000, 0, 0, 1, 0, 0));
+ startQuestTimer("camera_17", 7500, _frintezza, null);
}
else if (event.equalsIgnoreCase("camera_17"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 1500, 110, 25, 10000, 13000, 0, 0, 1, 0, 0));
- startQuestTimer("camera_18", 9500, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 1500, 110, 25, 10000, 13000, 0, 0, 1, 0, 0));
+ startQuestTimer("camera_18", 9500, _frintezza, null);
}
else if (event.equalsIgnoreCase("camera_18"))
{
- _Zone.broadcastPacket(new SpecialCamera(_overheadDummy, 930, 160, -20, 0, 1000, 0, 0, 1, 0, 0));
+ _zone.broadcastPacket(new SpecialCamera(_overheadDummy, 930, 160, -20, 0, 1000, 0, 0, 1, 0, 0));
startQuestTimer("camera_18b", 0, _overheadDummy, null);
}
else if (event.equalsIgnoreCase("camera_18b"))
{
- _Zone.broadcastPacket(new SpecialCamera(_overheadDummy, 600, 180, -25, 0, 10000, 0, 0, 1, 0, 0));
- _Zone.broadcastPacket(new MagicSkillUse(_scarletDummy, _overheadDummy, 5004, 1, 5800, 0));
+ _zone.broadcastPacket(new SpecialCamera(_overheadDummy, 600, 180, -25, 0, 10000, 0, 0, 1, 0, 0));
+ _zone.broadcastPacket(new MagicSkillUse(_scarletDummy, _overheadDummy, 5004, 1, 5800, 0));
- weakScarlet = (GrandBossInstance) addSpawn(29046, 174232, -88020, -5110, 16384, false, 0, true);
- weakScarlet.setIsInvul(true);
- weakScarlet.setIsImmobilized(true);
- weakScarlet.disableAllSkills();
+ _weakScarlet = (GrandBossInstance) addSpawn(29046, 174232, -88020, -5110, 16384, false, 0, true);
+ _weakScarlet.setIsInvul(true);
+ _weakScarlet.setIsImmobilized(true);
+ _weakScarlet.disableAllSkills();
// _Zone.updateKnownList(weakScarlet);
- activeScarlet = weakScarlet;
+ _activeScarlet = _weakScarlet;
startQuestTimer("camera_19", 2400, _scarletDummy, null);
startQuestTimer("camera_19b", 5000, _scarletDummy, null);
}
else if (event.equalsIgnoreCase("camera_19"))
{
- weakScarlet.teleToLocation(174232, -88020, -5110);
+ _weakScarlet.teleToLocation(174232, -88020, -5110);
}
else if (event.equalsIgnoreCase("camera_19b"))
{
- _Zone.broadcastPacket(new SpecialCamera(_scarletDummy, 800, 180, 10, 1000, 10000, 0, 0, 1, 0, 0));
+ _zone.broadcastPacket(new SpecialCamera(_scarletDummy, 800, 180, 10, 1000, 10000, 0, 0, 1, 0, 0));
startQuestTimer("camera_20", 2100, _scarletDummy, null);
}
else if (event.equalsIgnoreCase("camera_20"))
{
- _Zone.broadcastPacket(new SpecialCamera(weakScarlet, 300, 60, 8, 0, 10000, 0, 0, 1, 0, 0));
- startQuestTimer("camera_21", 2000, weakScarlet, null);
+ _zone.broadcastPacket(new SpecialCamera(_weakScarlet, 300, 60, 8, 0, 10000, 0, 0, 1, 0, 0));
+ startQuestTimer("camera_21", 2000, _weakScarlet, null);
}
else if (event.equalsIgnoreCase("camera_21"))
{
- _Zone.broadcastPacket(new SpecialCamera(weakScarlet, 500, 90, 10, 3000, 5000, 0, 0, 1, 0, 0));
- startQuestTimer("camera_22", 3000, weakScarlet, null);
+ _zone.broadcastPacket(new SpecialCamera(_weakScarlet, 500, 90, 10, 3000, 5000, 0, 0, 1, 0, 0));
+ startQuestTimer("camera_22", 3000, _weakScarlet, null);
}
else if (event.equalsIgnoreCase("camera_22"))
{
- portrait2 = (MonsterInstance) addSpawn(29049, 175876, -88713, -5000, 28205, false, 0);
- portrait2.setIsImmobilized(true);
- portrait2.disableAllSkills();
+ _portrait2 = (MonsterInstance) addSpawn(29049, 175876, -88713, -5000, 28205, false, 0);
+ _portrait2.setIsImmobilized(true);
+ _portrait2.disableAllSkills();
// _Zone.updateKnownList(portrait2);
- portrait3 = (MonsterInstance) addSpawn(29049, 172608, -88702, -5000, 64817, false, 0);
- portrait3.setIsImmobilized(true);
- portrait3.disableAllSkills();
+ _portrait3 = (MonsterInstance) addSpawn(29049, 172608, -88702, -5000, 64817, false, 0);
+ _portrait3.setIsImmobilized(true);
+ _portrait3.disableAllSkills();
// _Zone.updateKnownList(portrait3);
- portrait1 = (MonsterInstance) addSpawn(29048, 175833, -87165, -5000, 35048, false, 0);
- portrait1.setIsImmobilized(true);
- portrait1.disableAllSkills();
+ _portrait1 = (MonsterInstance) addSpawn(29048, 175833, -87165, -5000, 35048, false, 0);
+ _portrait1.setIsImmobilized(true);
+ _portrait1.disableAllSkills();
// _Zone.updateKnownList(portrait1);
- portrait4 = (MonsterInstance) addSpawn(29048, 172634, -87165, -5000, 57730, false, 0);
- portrait4.setIsImmobilized(true);
- portrait4.disableAllSkills();
+ _portrait4 = (MonsterInstance) addSpawn(29048, 172634, -87165, -5000, 57730, false, 0);
+ _portrait4.setIsImmobilized(true);
+ _portrait4.disableAllSkills();
// _Zone.updateKnownList(portrait4);
_overheadDummy.deleteMe();
@@ -760,43 +757,43 @@ public class Frintezza extends AbstractNpcAI
_overheadDummy = null;
_scarletDummy = null;
- startQuestTimer("camera_23", 2000, weakScarlet, null);
- startQuestTimer("start_pc", 2000, weakScarlet, null);
- startQuestTimer("loc_check", 60000, weakScarlet, null, true);
- startQuestTimer("songs_play", 10000 + Rnd.get(10000), frintezza, null);
- startQuestTimer("skill01", 10000 + Rnd.get(10000), weakScarlet, null);
+ startQuestTimer("camera_23", 2000, _weakScarlet, null);
+ startQuestTimer("start_pc", 2000, _weakScarlet, null);
+ startQuestTimer("loc_check", 60000, _weakScarlet, null, true);
+ startQuestTimer("songs_play", 10000 + Rnd.get(10000), _frintezza, null);
+ startQuestTimer("skill01", 10000 + Rnd.get(10000), _weakScarlet, null);
}
else if (event.equalsIgnoreCase("camera_23"))
{
- demon1.setIsImmobilized(false);
- demon2.setIsImmobilized(false);
- demon3.setIsImmobilized(false);
- demon4.setIsImmobilized(false);
- demon1.enableAllSkills();
- demon2.enableAllSkills();
- demon3.enableAllSkills();
- demon4.enableAllSkills();
- portrait1.setIsImmobilized(false);
- portrait2.setIsImmobilized(false);
- portrait3.setIsImmobilized(false);
- portrait4.setIsImmobilized(false);
- portrait1.enableAllSkills();
- portrait2.enableAllSkills();
- portrait3.enableAllSkills();
- portrait4.enableAllSkills();
- weakScarlet.setIsInvul(false);
- weakScarlet.setIsImmobilized(false);
- weakScarlet.enableAllSkills();
- weakScarlet.setRunning();
+ _demon1.setIsImmobilized(false);
+ _demon2.setIsImmobilized(false);
+ _demon3.setIsImmobilized(false);
+ _demon4.setIsImmobilized(false);
+ _demon1.enableAllSkills();
+ _demon2.enableAllSkills();
+ _demon3.enableAllSkills();
+ _demon4.enableAllSkills();
+ _portrait1.setIsImmobilized(false);
+ _portrait2.setIsImmobilized(false);
+ _portrait3.setIsImmobilized(false);
+ _portrait4.setIsImmobilized(false);
+ _portrait1.enableAllSkills();
+ _portrait2.enableAllSkills();
+ _portrait3.enableAllSkills();
+ _portrait4.enableAllSkills();
+ _weakScarlet.setIsInvul(false);
+ _weakScarlet.setIsImmobilized(false);
+ _weakScarlet.enableAllSkills();
+ _weakScarlet.setRunning();
- startQuestTimer("spawn_minion", 20000, portrait1, null);
- startQuestTimer("spawn_minion", 20000, portrait2, null);
- startQuestTimer("spawn_minion", 20000, portrait3, null);
- startQuestTimer("spawn_minion", 20000, portrait4, null);
+ startQuestTimer("spawn_minion", 20000, _portrait1, null);
+ startQuestTimer("spawn_minion", 20000, _portrait2, null);
+ startQuestTimer("spawn_minion", 20000, _portrait3, null);
+ startQuestTimer("spawn_minion", 20000, _portrait4, null);
}
else if (event.equalsIgnoreCase("stop_pc"))
{
- for (Creature cha : _Zone.getCharactersInside())
+ for (Creature cha : _zone.getCharactersInside())
{
cha.abortAttack();
cha.abortCast();
@@ -809,21 +806,21 @@ public class Frintezza extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("stop_npc"))
{
- _Heading = npc.getHeading();
- if (_Heading < 32768)
+ int heading = npc.getHeading();
+ if (heading < 32768)
{
- _Angle = Math.abs(180 - (int) (_Heading / 182.044444444));
+ _angle = Math.abs(180 - (int) (heading / 182.044444444));
}
else
{
- _Angle = Math.abs(540 - (int) (_Heading / 182.044444444));
+ _angle = Math.abs(540 - (int) (heading / 182.044444444));
}
}
else if (event.equalsIgnoreCase("start_pc"))
{
- for (Creature cha : _Zone.getCharactersInside())
+ for (Creature cha : _zone.getCharactersInside())
{
- if (cha != frintezza)
+ if (cha != _frintezza)
{
cha.enableAllSkills();
cha.setIsImmobilized(false);
@@ -837,238 +834,238 @@ public class Frintezza extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("morph_end"))
{
- _OnMorph = 0;
+ _onMorph = 0;
}
else if (event.equalsIgnoreCase("morph_01"))
{
- _Zone.broadcastPacket(new SpecialCamera(weakScarlet, 250, _Angle, 12, 2000, 15000, 0, 0, 1, 0, 0));
- startQuestTimer("morph_02", 3000, weakScarlet, null);
+ _zone.broadcastPacket(new SpecialCamera(_weakScarlet, 250, _angle, 12, 2000, 15000, 0, 0, 1, 0, 0));
+ startQuestTimer("morph_02", 3000, _weakScarlet, null);
}
else if (event.equalsIgnoreCase("morph_02"))
{
- _Zone.broadcastPacket(new SocialAction(weakScarlet.getObjectId(), 1));
- weakScarlet.setRHandId(7903);
- startQuestTimer("morph_03", 4000, weakScarlet, null);
+ _zone.broadcastPacket(new SocialAction(_weakScarlet.getObjectId(), 1));
+ _weakScarlet.setRHandId(7903);
+ startQuestTimer("morph_03", 4000, _weakScarlet, null);
}
else if (event.equalsIgnoreCase("morph_03"))
{
- startQuestTimer("morph_04", 1500, weakScarlet, null);
+ startQuestTimer("morph_04", 1500, _weakScarlet, null);
}
else if (event.equalsIgnoreCase("morph_04"))
{
- _Zone.broadcastPacket(new SocialAction(weakScarlet.getObjectId(), 4));
+ _zone.broadcastPacket(new SocialAction(_weakScarlet.getObjectId(), 4));
Skill skill = SkillData.getInstance().getSkill(5017, 1);
if (skill != null)
{
- skill.applyEffects(weakScarlet, weakScarlet);
+ skill.applyEffects(_weakScarlet, _weakScarlet);
}
- weakScarlet.setCollisionHeight(109.4);
- weakScarlet.setCollisionRadius(54);
- weakScarlet.broadcastInfo();
+ _weakScarlet.setCollisionHeight(109.4);
+ _weakScarlet.setCollisionRadius(54);
+ _weakScarlet.broadcastInfo();
- startQuestTimer("morph_end", 6000, weakScarlet, null);
- startQuestTimer("start_pc", 3000, weakScarlet, null);
- startQuestTimer("start_npc", 3000, weakScarlet, null);
- startQuestTimer("songs_play", 10000 + Rnd.get(10000), frintezza, null);
- startQuestTimer("skill02", 10000 + Rnd.get(10000), weakScarlet, null);
+ startQuestTimer("morph_end", 6000, _weakScarlet, null);
+ startQuestTimer("start_pc", 3000, _weakScarlet, null);
+ startQuestTimer("start_npc", 3000, _weakScarlet, null);
+ startQuestTimer("songs_play", 10000 + Rnd.get(10000), _frintezza, null);
+ startQuestTimer("skill02", 10000 + Rnd.get(10000), _weakScarlet, null);
}
else if (event.equalsIgnoreCase("morph_05a"))
{
- _Zone.broadcastPacket(new SocialAction(frintezza.getObjectId(), 4));
+ _zone.broadcastPacket(new SocialAction(_frintezza.getObjectId(), 4));
}
else if (event.equalsIgnoreCase("morph_05"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 250, 120, 15, 0, 1000, 0, 0, 1, 0, 0));
- startQuestTimer("morph_06", 0, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 250, 120, 15, 0, 1000, 0, 0, 1, 0, 0));
+ startQuestTimer("morph_06", 0, _frintezza, null);
}
else if (event.equalsIgnoreCase("morph_06"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 250, 120, 15, 0, 10000, 0, 0, 1, 0, 0));
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 250, 120, 15, 0, 10000, 0, 0, 1, 0, 0));
cancelQuestTimers("loc_check");
- _Scarlet_x = weakScarlet.getX();
- _Scarlet_y = weakScarlet.getY();
- _Scarlet_z = weakScarlet.getZ();
- _Scarlet_h = weakScarlet.getHeading();
- weakScarlet.deleteMe();
- weakScarlet = null;
- activeScarlet = null;
- weakScarlet = (GrandBossInstance) addSpawn(29046, _Scarlet_x, _Scarlet_y, _Scarlet_z, _Scarlet_h, false, 0);
- weakScarlet.setIsInvul(true);
- weakScarlet.setIsImmobilized(true);
- weakScarlet.disableAllSkills();
- weakScarlet.setRHandId(7903);
+ _scarletX = _weakScarlet.getX();
+ _scarletY = _weakScarlet.getY();
+ _scarletZ = _weakScarlet.getZ();
+ _scarletH = _weakScarlet.getHeading();
+ _weakScarlet.deleteMe();
+ _weakScarlet = null;
+ _activeScarlet = null;
+ _weakScarlet = (GrandBossInstance) addSpawn(29046, _scarletX, _scarletY, _scarletZ, _scarletH, false, 0);
+ _weakScarlet.setIsInvul(true);
+ _weakScarlet.setIsImmobilized(true);
+ _weakScarlet.disableAllSkills();
+ _weakScarlet.setRHandId(7903);
// _Zone.updateKnownList(weakScarlet);
- startQuestTimer("morph_07", 7000, frintezza, null);
+ startQuestTimer("morph_07", 7000, _frintezza, null);
}
else if (event.equalsIgnoreCase("morph_07"))
{
- _Zone.broadcastPacket(new MagicSkillUse(frintezza, frintezza, 5006, 1, 34000, 0));
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 500, 70, 15, 3000, 10000, 0, 0, 1, 0, 0));
- startQuestTimer("morph_08", 3000, frintezza, null);
+ _zone.broadcastPacket(new MagicSkillUse(_frintezza, _frintezza, 5006, 1, 34000, 0));
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 500, 70, 15, 3000, 10000, 0, 0, 1, 0, 0));
+ startQuestTimer("morph_08", 3000, _frintezza, null);
}
else if (event.equalsIgnoreCase("morph_08"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 2500, 90, 12, 6000, 10000, 0, 0, 1, 0, 0));
- startQuestTimer("morph_09", 3000, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 2500, 90, 12, 6000, 10000, 0, 0, 1, 0, 0));
+ startQuestTimer("morph_09", 3000, _frintezza, null);
}
else if (event.equalsIgnoreCase("morph_09"))
{
- _Zone.broadcastPacket(new SpecialCamera(weakScarlet, 250, _Angle, 12, 0, 1000, 0, 0, 1, 0, 0));
- startQuestTimer("morph_10", 0, weakScarlet, null);
+ _zone.broadcastPacket(new SpecialCamera(_weakScarlet, 250, _angle, 12, 0, 1000, 0, 0, 1, 0, 0));
+ startQuestTimer("morph_10", 0, _weakScarlet, null);
}
else if (event.equalsIgnoreCase("morph_10"))
{
- _Zone.broadcastPacket(new SpecialCamera(weakScarlet, 250, _Angle, 12, 0, 10000, 0, 0, 1, 0, 0));
- startQuestTimer("morph_11", 500, weakScarlet, null);
+ _zone.broadcastPacket(new SpecialCamera(_weakScarlet, 250, _angle, 12, 0, 10000, 0, 0, 1, 0, 0));
+ startQuestTimer("morph_11", 500, _weakScarlet, null);
}
else if (event.equalsIgnoreCase("morph_11"))
{
- weakScarlet.doDie(weakScarlet);
- _Zone.broadcastPacket(new SpecialCamera(weakScarlet, 450, _Angle, 14, 8000, 8000, 0, 0, 1, 0, 0));
+ _weakScarlet.doDie(_weakScarlet);
+ _zone.broadcastPacket(new SpecialCamera(_weakScarlet, 450, _angle, 14, 8000, 8000, 0, 0, 1, 0, 0));
- startQuestTimer("morph_12", 6250, weakScarlet, null);
- startQuestTimer("morph_13", 7200, weakScarlet, null);
+ startQuestTimer("morph_12", 6250, _weakScarlet, null);
+ startQuestTimer("morph_13", 7200, _weakScarlet, null);
}
else if (event.equalsIgnoreCase("morph_12"))
{
- weakScarlet.deleteMe();
- weakScarlet = null;
+ _weakScarlet.deleteMe();
+ _weakScarlet = null;
}
else if (event.equalsIgnoreCase("morph_13"))
{
- strongScarlet = (GrandBossInstance) addSpawn(SCARLET2, _Scarlet_x, _Scarlet_y, _Scarlet_z, _Scarlet_h, false, 0);
- strongScarlet.setIsInvul(true);
- strongScarlet.setIsImmobilized(true);
- strongScarlet.disableAllSkills();
+ _strongScarlet = (GrandBossInstance) addSpawn(SCARLET2, _scarletX, _scarletY, _scarletZ, _scarletH, false, 0);
+ _strongScarlet.setIsInvul(true);
+ _strongScarlet.setIsImmobilized(true);
+ _strongScarlet.disableAllSkills();
// _Zone.updateKnownList(strongScarlet);
- activeScarlet = strongScarlet;
+ _activeScarlet = _strongScarlet;
- _Zone.broadcastPacket(new SpecialCamera(strongScarlet, 450, _Angle, 12, 500, 14000, 0, 0, 1, 0, 0));
+ _zone.broadcastPacket(new SpecialCamera(_strongScarlet, 450, _angle, 12, 500, 14000, 0, 0, 1, 0, 0));
- startQuestTimer("morph_14", 3000, strongScarlet, null);
- startQuestTimer("loc_check", 60000, strongScarlet, null, true);
+ startQuestTimer("morph_14", 3000, _strongScarlet, null);
+ startQuestTimer("loc_check", 60000, _strongScarlet, null, true);
}
else if (event.equalsIgnoreCase("morph_14"))
{
- startQuestTimer("morph_15", 5100, strongScarlet, null);
+ startQuestTimer("morph_15", 5100, _strongScarlet, null);
}
else if (event.equalsIgnoreCase("morph_15"))
{
- _Zone.broadcastPacket(new SocialAction(strongScarlet.getObjectId(), 2));
+ _zone.broadcastPacket(new SocialAction(_strongScarlet.getObjectId(), 2));
Skill skill = SkillData.getInstance().getSkill(5017, 1);
if (skill != null)
{
- skill.applyEffects(strongScarlet, strongScarlet);
+ skill.applyEffects(_strongScarlet, _strongScarlet);
}
- strongScarlet.setCollisionHeight(130);
- strongScarlet.setCollisionRadius(115);
- strongScarlet.broadcastInfo();
+ _strongScarlet.setCollisionHeight(130);
+ _strongScarlet.setCollisionRadius(115);
+ _strongScarlet.broadcastInfo();
- startQuestTimer("morph_end", 9000, strongScarlet, null);
- startQuestTimer("start_pc", 6000, strongScarlet, null);
- startQuestTimer("start_npc", 6000, strongScarlet, null);
- startQuestTimer("songs_play", 10000 + Rnd.get(10000), frintezza, null);
- startQuestTimer("skill03", 10000 + Rnd.get(10000), strongScarlet, null);
+ startQuestTimer("morph_end", 9000, _strongScarlet, null);
+ startQuestTimer("start_pc", 6000, _strongScarlet, null);
+ startQuestTimer("start_npc", 6000, _strongScarlet, null);
+ startQuestTimer("songs_play", 10000 + Rnd.get(10000), _frintezza, null);
+ startQuestTimer("skill03", 10000 + Rnd.get(10000), _strongScarlet, null);
}
else if (event.equalsIgnoreCase("morph_16"))
{
- _Zone.broadcastPacket(new SpecialCamera(strongScarlet, 300, _Angle - 180, 5, 0, 7000, 0, 0, 1, 0, 0));
- startQuestTimer("morph_17", 0, strongScarlet, null);
+ _zone.broadcastPacket(new SpecialCamera(_strongScarlet, 300, _angle - 180, 5, 0, 7000, 0, 0, 1, 0, 0));
+ startQuestTimer("morph_17", 0, _strongScarlet, null);
}
else if (event.equalsIgnoreCase("morph_17"))
{
- _Zone.broadcastPacket(new SpecialCamera(strongScarlet, 200, _Angle, 85, 4000, 10000, 0, 0, 1, 0, 0));
- startQuestTimer("morph_17b", 7400, frintezza, null);
- startQuestTimer("morph_18", 7500, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_strongScarlet, 200, _angle, 85, 4000, 10000, 0, 0, 1, 0, 0));
+ startQuestTimer("morph_17b", 7400, _frintezza, null);
+ startQuestTimer("morph_18", 7500, _frintezza, null);
}
else if (event.equalsIgnoreCase("morph_17b"))
{
- frintezza.doDie(frintezza);
+ _frintezza.doDie(_frintezza);
}
else if (event.equalsIgnoreCase("morph_18"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 100, 120, 5, 0, 7000, 0, 0, 1, 0, 0));
- startQuestTimer("morph_19", 0, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 100, 120, 5, 0, 7000, 0, 0, 1, 0, 0));
+ startQuestTimer("morph_19", 0, _frintezza, null);
}
else if (event.equalsIgnoreCase("morph_19"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 100, 90, 5, 5000, 15000, 0, 0, 1, 0, 0));
- startQuestTimer("morph_20", 7000, frintezza, null);
- startQuestTimer("spawn_cubes", 7000, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 100, 90, 5, 5000, 15000, 0, 0, 1, 0, 0));
+ startQuestTimer("morph_20", 7000, _frintezza, null);
+ startQuestTimer("spawn_cubes", 7000, _frintezza, null);
}
else if (event.equalsIgnoreCase("morph_20"))
{
- _Zone.broadcastPacket(new SpecialCamera(frintezza, 900, 90, 25, 7000, 10000, 0, 0, 1, 0, 0));
- startQuestTimer("start_pc", 7000, frintezza, null);
+ _zone.broadcastPacket(new SpecialCamera(_frintezza, 900, 90, 25, 7000, 10000, 0, 0, 1, 0, 0));
+ startQuestTimer("start_pc", 7000, _frintezza, null);
}
else if (event.equalsIgnoreCase("songs_play"))
{
- if ((frintezza != null) && !frintezza.isDead() && (_OnMorph == 0))
+ if ((_frintezza != null) && !_frintezza.isDead() && (_onMorph == 0))
{
- _OnSong = Rnd.get(1, 5);
- if ((_OnSong == 1) && (_ThirdMorph == 1) && (strongScarlet.getCurrentHp() < (strongScarlet.getMaxHp() * 0.6)) && (Rnd.get(100) < 80))
+ _onSong = Rnd.get(1, 5);
+ if ((_onSong == 1) && (_thirdMorph == 1) && (_strongScarlet.getCurrentHp() < (_strongScarlet.getMaxHp() * 0.6)) && (Rnd.get(100) < 80))
{
- _Zone.broadcastPacket(new MagicSkillUse(frintezza, frintezza, 5007, 1, 32000, 0));
- startQuestTimer("songs_effect", 5000, frintezza, null);
- startQuestTimer("songs_play", 32000 + Rnd.get(10000), frintezza, null);
+ _zone.broadcastPacket(new MagicSkillUse(_frintezza, _frintezza, 5007, 1, 32000, 0));
+ startQuestTimer("songs_effect", 5000, _frintezza, null);
+ startQuestTimer("songs_play", 32000 + Rnd.get(10000), _frintezza, null);
}
- else if ((_OnSong == 2) || (_OnSong == 3))
+ else if ((_onSong == 2) || (_onSong == 3))
{
- _Zone.broadcastPacket(new MagicSkillUse(frintezza, frintezza, 5007, _OnSong, 32000, 0));
- startQuestTimer("songs_effect", 5000, frintezza, null);
- startQuestTimer("songs_play", 32000 + Rnd.get(10000), frintezza, null);
+ _zone.broadcastPacket(new MagicSkillUse(_frintezza, _frintezza, 5007, _onSong, 32000, 0));
+ startQuestTimer("songs_effect", 5000, _frintezza, null);
+ startQuestTimer("songs_play", 32000 + Rnd.get(10000), _frintezza, null);
}
- else if ((_OnSong == 4) && (_SecondMorph == 1))
+ else if ((_onSong == 4) && (_secondMorph == 1))
{
- _Zone.broadcastPacket(new MagicSkillUse(frintezza, frintezza, 5007, 4, 31000, 0));
- startQuestTimer("songs_effect", 5000, frintezza, null);
- startQuestTimer("songs_play", 31000 + Rnd.get(10000), frintezza, null);
+ _zone.broadcastPacket(new MagicSkillUse(_frintezza, _frintezza, 5007, 4, 31000, 0));
+ startQuestTimer("songs_effect", 5000, _frintezza, null);
+ startQuestTimer("songs_play", 31000 + Rnd.get(10000), _frintezza, null);
}
- else if ((_OnSong == 5) && (_ThirdMorph == 1) && (_Abnormal == 0))
+ else if ((_onSong == 5) && (_thirdMorph == 1) && (_abnormal == 0))
{
- _Abnormal = 1;
- _Zone.broadcastPacket(new MagicSkillUse(frintezza, frintezza, 5007, 5, 35000, 0));
- startQuestTimer("songs_effect", 5000, frintezza, null);
- startQuestTimer("songs_play", 35000 + Rnd.get(10000), frintezza, null);
+ _abnormal = 1;
+ _zone.broadcastPacket(new MagicSkillUse(_frintezza, _frintezza, 5007, 5, 35000, 0));
+ startQuestTimer("songs_effect", 5000, _frintezza, null);
+ startQuestTimer("songs_play", 35000 + Rnd.get(10000), _frintezza, null);
}
else
{
- startQuestTimer("songs_play", 5000 + Rnd.get(5000), frintezza, null);
+ startQuestTimer("songs_play", 5000 + Rnd.get(5000), _frintezza, null);
}
}
}
else if (event.equalsIgnoreCase("songs_effect"))
{
- Skill skill = SkillData.getInstance().getSkill(5008, _OnSong);
+ Skill skill = SkillData.getInstance().getSkill(5008, _onSong);
if (skill == null)
{
return null;
}
- if ((_OnSong == 1) || (_OnSong == 2) || (_OnSong == 3))
+ if ((_onSong == 1) || (_onSong == 2) || (_onSong == 3))
{
- if ((frintezza != null) && !frintezza.isDead() && (activeScarlet != null) && !activeScarlet.isDead())
+ if ((_frintezza != null) && !_frintezza.isDead() && (_activeScarlet != null) && !_activeScarlet.isDead())
{
- skill.applyEffects(frintezza, activeScarlet);
+ skill.applyEffects(_frintezza, _activeScarlet);
}
}
- else if (_OnSong == 4)
+ else if (_onSong == 4)
{
- for (Creature cha : _Zone.getCharactersInside())
+ for (Creature cha : _zone.getCharactersInside())
{
if ((cha instanceof PlayerInstance) && (Rnd.get(100) < 80))
{
- skill.applyEffects(frintezza, cha);
+ skill.applyEffects(_frintezza, cha);
cha.sendPacket(new SystemMessage(SystemMessageId.S1_S_EFFECT_CAN_BE_FELT).addSkillName(5008, 4));
}
}
}
- else if (_OnSong == 5)
+ else if (_onSong == 5)
{
- for (Creature cha : _Zone.getCharactersInside())
+ for (Creature cha : _zone.getCharactersInside())
{
if ((cha instanceof PlayerInstance) && (Rnd.get(100) < 70))
{
@@ -1079,17 +1076,17 @@ public class Frintezza extends AbstractNpcAI
cha.setIsParalyzed(true);
cha.setIsImmobilized(true);
cha.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
- skill.applyEffects(frintezza, cha);
+ skill.applyEffects(_frintezza, cha);
cha.startAbnormalVisualEffect(true, AbnormalVisualEffect.DANCE_ROOT);
cha.sendPacket(new SystemMessage(SystemMessageId.S1_S_EFFECT_CAN_BE_FELT).addSkillName(5008, 5));
}
}
- startQuestTimer("stop_effect", 25000, frintezza, null);
+ startQuestTimer("stop_effect", 25000, _frintezza, null);
}
}
else if (event.equalsIgnoreCase("stop_effect"))
{
- for (Creature cha : _Zone.getCharactersInside())
+ for (Creature cha : _zone.getCharactersInside())
{
if (cha instanceof PlayerInstance)
{
@@ -1100,7 +1097,7 @@ public class Frintezza extends AbstractNpcAI
cha.setIsParalyzed(false);
}
}
- _Abnormal = 0;
+ _abnormal = 0;
}
else if (event.equalsIgnoreCase("attack_stop"))
{
@@ -1110,55 +1107,55 @@ public class Frintezza extends AbstractNpcAI
cancelQuestTimers("songs_play");
cancelQuestTimers("songs_effect");
- _Zone.broadcastPacket(new MagicSkillCanceled(frintezza.getObjectId()));
+ _zone.broadcastPacket(new MagicSkillCanceled(_frintezza.getObjectId()));
}
else if (event.equalsIgnoreCase("check_hp"))
{
if (npc.isDead())
{
- _OnMorph = 1;
- _Zone.broadcastPacket(new PlaySound(1, "BS01_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
+ _onMorph = 1;
+ _zone.broadcastPacket(new PlaySound(1, "BS01_D", 1, npc.getObjectId(), npc.getX(), npc.getY(), npc.getZ()));
- startQuestTimer("attack_stop", 0, frintezza, null);
+ startQuestTimer("attack_stop", 0, _frintezza, null);
startQuestTimer("stop_pc", 0, npc, null);
startQuestTimer("stop_npc", 0, npc, null);
startQuestTimer("morph_16", 0, npc, null);
}
else
{
- _CheckDie = _CheckDie + 10;
- if (_CheckDie < 3000)
+ _checkDie = _checkDie + 10;
+ if (_checkDie < 3000)
{
startQuestTimer("check_hp", 10, npc, null);
}
else
{
- _OnCheck = 0;
- _CheckDie = 0;
+ _onCheck = 0;
+ _checkDie = 0;
}
}
}
else if (event.equalsIgnoreCase("skill01"))
{
- if ((weakScarlet != null) && !weakScarlet.isDead() && (_SecondMorph == 0) && (_ThirdMorph == 0) && (_OnMorph == 0))
+ 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]);
if (skill != null)
{
- weakScarlet.stopMove(null);
- weakScarlet.setIsCastingNow(true);
- weakScarlet.doCast(skill);
+ _weakScarlet.stopMove(null);
+ _weakScarlet.setIsCastingNow(true);
+ _weakScarlet.doCast(skill);
}
startQuestTimer("skill01", _skill[i][2] + 5000 + Rnd.get(10000), npc, null);
}
}
else if (event.equalsIgnoreCase("skill02"))
{
- if ((weakScarlet != null) && !weakScarlet.isDead() && (_SecondMorph == 1) && (_ThirdMorph == 0) && (_OnMorph == 0))
+ if ((_weakScarlet != null) && !_weakScarlet.isDead() && (_secondMorph == 1) && (_thirdMorph == 0) && (_onMorph == 0))
{
int i = 0;
- if (_Abnormal == 0)
+ if (_abnormal == 0)
{
i = Rnd.get(2, 5);
}
@@ -1170,25 +1167,25 @@ public class Frintezza extends AbstractNpcAI
Skill skill = SkillData.getInstance().getSkill(_skill[i][0], _skill[i][1]);
if (skill != null)
{
- weakScarlet.stopMove(null);
- weakScarlet.setIsCastingNow(true);
- weakScarlet.doCast(skill);
+ _weakScarlet.stopMove(null);
+ _weakScarlet.setIsCastingNow(true);
+ _weakScarlet.doCast(skill);
}
startQuestTimer("skill02", _skill[i][2] + 5000 + Rnd.get(10000), npc, null);
if (i == 5)
{
- _Abnormal = 1;
- startQuestTimer("float_effect", 4000, weakScarlet, null);
+ _abnormal = 1;
+ startQuestTimer("float_effect", 4000, _weakScarlet, null);
}
}
}
else if (event.equalsIgnoreCase("skill03"))
{
- if ((strongScarlet != null) && !strongScarlet.isDead() && (_SecondMorph == 1) && (_ThirdMorph == 1) && (_OnMorph == 0))
+ if ((_strongScarlet != null) && !_strongScarlet.isDead() && (_secondMorph == 1) && (_thirdMorph == 1) && (_onMorph == 0))
{
int i = 0;
- if (_Abnormal == 0)
+ if (_abnormal == 0)
{
i = Rnd.get(6, 10);
}
@@ -1200,15 +1197,15 @@ public class Frintezza extends AbstractNpcAI
Skill skill = SkillData.getInstance().getSkill(_skill[i][0], _skill[i][1]);
if (skill != null)
{
- strongScarlet.stopMove(null);
- strongScarlet.setIsCastingNow(true);
- strongScarlet.doCast(skill);
+ _strongScarlet.stopMove(null);
+ _strongScarlet.setIsCastingNow(true);
+ _strongScarlet.doCast(skill);
}
startQuestTimer("skill03", _skill[i][2] + 5000 + Rnd.get(10000), npc, null);
if (i == 10)
{
- _Abnormal = 1;
+ _abnormal = 1;
startQuestTimer("float_effect", 3000, npc, null);
}
}
@@ -1221,21 +1218,18 @@ public class Frintezza extends AbstractNpcAI
}
else
{
- for (Creature cha : _Zone.getCharactersInside())
+ for (Creature cha : _zone.getCharactersInside())
{
- if (cha instanceof PlayerInstance)
+ if ((cha instanceof PlayerInstance) && (cha.getEffectList().getBuffInfoBySkillId(5016) != null))
{
- if (cha.getEffectList().getBuffInfoBySkillId(5016) != null)
- {
- cha.abortAttack();
- cha.abortCast();
- cha.disableAllSkills();
- cha.stopMove(null);
- cha.setIsParalyzed(true);
- cha.setIsImmobilized(true);
- cha.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
- cha.startAbnormalVisualEffect(true, AbnormalVisualEffect.FLOATING_ROOT);
- }
+ cha.abortAttack();
+ cha.abortCast();
+ cha.disableAllSkills();
+ cha.stopMove(null);
+ cha.setIsParalyzed(true);
+ cha.setIsImmobilized(true);
+ cha.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+ cha.startAbnormalVisualEffect(true, AbnormalVisualEffect.FLOATING_ROOT);
}
}
startQuestTimer("stop_effect", 25000, npc, null);
@@ -1243,16 +1237,16 @@ public class Frintezza extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("action"))
{
- _Zone.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
+ _zone.broadcastPacket(new SocialAction(npc.getObjectId(), 1));
}
else if (event.equalsIgnoreCase("bomber"))
{
- _Bomber = 0;
+ _bomber = 0;
}
else if (event.equalsIgnoreCase("room_final"))
{
- _Zone.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.SHOUT, npc.getId(), "Exceeded his time limit, challenge failed!"));
- _Zone.oustAllPlayers();
+ _zone.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.SHOUT, npc.getId(), "Exceeded his time limit, challenge failed!"));
+ _zone.oustAllPlayers();
cancelQuestTimers("waiting");
cancelQuestTimers("frintezza_despawn");
@@ -1265,10 +1259,10 @@ public class Frintezza extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("frintezza_despawn"))
{
- temp = (System.currentTimeMillis() - _LastAction);
+ temp = (System.currentTimeMillis() - _lastAction);
if (temp > 900000)
{
- _Zone.oustAllPlayers();
+ _zone.oustAllPlayers();
cancelQuestTimers("waiting");
cancelQuestTimers("loc_check");
@@ -1289,24 +1283,23 @@ public class Frintezza extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("minions_despawn"))
{
- for (int i = 0; i < Minions.size(); i++)
+ for (int i = 0; i < _minions.size(); i++)
{
- Attackable mob = Minions.get(i);
+ Attackable mob = _minions.get(i);
if (mob != null)
{
mob.decayMe();
}
}
- Minions.clear();
+ _minions.clear();
}
else if (event.equalsIgnoreCase("spawn_minion"))
{
- if ((npc != null) && !npc.isDead() && (frintezza != null) && !frintezza.isDead())
+ 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);
- // TODO:
// mob.setIsRaidMinion(true);
- Minions.add((Attackable) mob);
+ _minions.add((Attackable) mob);
startQuestTimer("action", 200, mob, null);
startQuestTimer("spawn_minion", 18000, npc, null);
@@ -1322,7 +1315,7 @@ public class Frintezza extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("remove_players"))
{
- _Zone.oustAllPlayers();
+ _zone.oustAllPlayers();
}
return super.onAdvEvent(event, npc, player);
@@ -1353,10 +1346,10 @@ public class Frintezza extends AbstractNpcAI
startQuestTimer("room1_spawn", 5000, npc, null);
startQuestTimer("room_final", 2100000, npc, null);
startQuestTimer("frintezza_despawn", 60000, npc, null, true);
- _LastAction = System.currentTimeMillis();
- _PlayersInside.add(player);
- _Zone.allowPlayerEntry(player, 300);
- player.teleToLocation(_invadeLoc[_LocCycle][0] + Rnd.get(50), _invadeLoc[_LocCycle][1] + Rnd.get(50), _invadeLoc[_LocCycle][2]);
+ _lastAction = System.currentTimeMillis();
+ _playersInside.add(player);
+ _zone.allowPlayerEntry(player, 300);
+ player.teleToLocation(_invadeLoc[_locCycle][0] + Rnd.get(50), _invadeLoc[_locCycle][1] + Rnd.get(50), _invadeLoc[_locCycle][2]);
}
else
{
@@ -1375,7 +1368,7 @@ public class Frintezza extends AbstractNpcAI
else
{
player.destroyItemByItemId("Quest", 8073, 1, player, true);
- CommandChannel CC = player.getParty().getCommandChannel();
+ CommandChannel cc = player.getParty().getCommandChannel();
GrandBossManager.getInstance().setBossStatus(FRINTEZZA, WAITING);
startQuestTimer("close", 0, npc, null);
@@ -1383,8 +1376,8 @@ public class Frintezza extends AbstractNpcAI
startQuestTimer("room_final", 2100000, npc, null);
startQuestTimer("frintezza_despawn", 60000, npc, null, true);
- _LastAction = System.currentTimeMillis();
- for (Party party : CC.getParties())
+ _lastAction = System.currentTimeMillis();
+ for (Party party : cc.getParties())
{
if (party == null)
{
@@ -1400,24 +1393,24 @@ public class Frintezza extends AbstractNpcAI
{
continue;
}
- if (_PlayersInside.size() > 45)
+ if (_playersInside.size() > 45)
{
member.sendMessage("The number of challenges have been full, so can not enter.");
break;
}
- _PlayersInside.add(member);
- _Zone.allowPlayerEntry(member, 300);
- member.teleToLocation(_invadeLoc[_LocCycle][0] + Rnd.get(50), _invadeLoc[_LocCycle][1] + Rnd.get(50), _invadeLoc[_LocCycle][2]);
+ _playersInside.add(member);
+ _zone.allowPlayerEntry(member, 300);
+ member.teleToLocation(_invadeLoc[_locCycle][0] + Rnd.get(50), _invadeLoc[_locCycle][1] + Rnd.get(50), _invadeLoc[_locCycle][2]);
}
- if (_PlayersInside.size() > 45)
+ if (_playersInside.size() > 45)
{
break;
}
- _LocCycle++;
- if (_LocCycle >= 6)
+ _locCycle++;
+ if (_locCycle >= 6)
{
- _LocCycle = 1;
+ _locCycle = 1;
}
}
}
@@ -1434,56 +1427,50 @@ public class Frintezza extends AbstractNpcAI
@Override
public String onAttack(Npc npc, PlayerInstance attacker, int damage, boolean isSummon)
{
- _LastAction = System.currentTimeMillis();
+ _lastAction = System.currentTimeMillis();
if (npc.getId() == FRINTEZZA)
{
npc.setCurrentHpMp(npc.getMaxHp(), 0);
return null;
}
- if ((npc.getId() == SCARLET1) && (_SecondMorph == 0) && (_ThirdMorph == 0) && (_OnMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75)) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+ if ((npc.getId() == SCARLET1) && (_secondMorph == 0) && (_thirdMorph == 0) && (_onMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.75)) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
{
- startQuestTimer("attack_stop", 0, frintezza, null);
+ startQuestTimer("attack_stop", 0, _frintezza, null);
- _SecondMorph = 1;
- _OnMorph = 1;
+ _secondMorph = 1;
+ _onMorph = 1;
startQuestTimer("stop_pc", 1000, npc, null);
startQuestTimer("stop_npc", 1000, npc, null);
startQuestTimer("morph_01", 1100, npc, null);
}
- else if ((npc.getId() == SCARLET1) && (_SecondMorph == 1) && (_ThirdMorph == 0) && (_OnMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.5)) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+ else if ((npc.getId() == SCARLET1) && (_secondMorph == 1) && (_thirdMorph == 0) && (_onMorph == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.5)) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
{
- startQuestTimer("attack_stop", 0, frintezza, null);
+ startQuestTimer("attack_stop", 0, _frintezza, null);
- _ThirdMorph = 1;
- _OnMorph = 1;
+ _thirdMorph = 1;
+ _onMorph = 1;
startQuestTimer("stop_pc", 2000, npc, null);
startQuestTimer("stop_npc", 2000, npc, null);
startQuestTimer("morph_05a", 2000, npc, null);
startQuestTimer("morph_05", 2100, npc, null);
}
- else if ((npc.getId() == SCARLET2) && (_SecondMorph == 1) && (_ThirdMorph == 1) && (_OnCheck == 0) && (damage >= npc.getCurrentHp()) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+ else if ((npc.getId() == SCARLET2) && (_secondMorph == 1) && (_thirdMorph == 1) && (_onCheck == 0) && (damage >= npc.getCurrentHp()) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
{
- _OnCheck = 1;
+ _onCheck = 1;
startQuestTimer("check_hp", 0, npc, null);
}
- else if (((npc.getId() == 29050) || (npc.getId() == 29051)) && (_Bomber == 0))
+ else if (((npc.getId() == 29050) || (npc.getId() == 29051)) && (_bomber == 0) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.1)) && (Rnd.get(100) < 30))
{
- if (npc.getCurrentHp() < (npc.getMaxHp() * 0.1))
+ _bomber = 1;
+ startQuestTimer("bomber", 3000, npc, null);
+
+ Skill skill = SkillData.getInstance().getSkill(5011, 1);
+ if (skill != null)
{
- if (Rnd.get(100) < 30)
- {
- _Bomber = 1;
- startQuestTimer("bomber", 3000, npc, null);
-
- Skill skill = SkillData.getInstance().getSkill(5011, 1);
- if (skill != null)
- {
- npc.setIsCastingNow(true);
- npc.doCast(skill);
- }
- }
+ npc.setIsCastingNow(true);
+ npc.doCast(skill);
}
}
@@ -1497,14 +1484,14 @@ public class Frintezza extends AbstractNpcAI
{
return null;
}
- else if ((npc.getId() == SCARLET2) && (_OnCheck == 0) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+ else if ((npc.getId() == SCARLET2) && (_onCheck == 0) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
{
- _OnCheck = 1;
+ _onCheck = 1;
startQuestTimer("stop_pc", 0, npc, null);
startQuestTimer("stop_npc", 0, npc, null);
startQuestTimer("morph_16", 0, npc, null);
}
- else if ((npc.getId() == SCARLET2) && (_OnCheck == 1) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
+ else if ((npc.getId() == SCARLET2) && (_onCheck == 1) && (GrandBossManager.getInstance().getBossStatus(FRINTEZZA) == FIGHTING))
{
cancelQuestTimers("loc_check");
cancelQuestTimers("spawn_minion");
@@ -1527,8 +1514,8 @@ public class Frintezza extends AbstractNpcAI
}
else if (npc.getId() == 18328)
{
- _KillHallAlarmDevice++;
- if (_KillHallAlarmDevice == 4)
+ _killHallAlarmDevice++;
+ if (_killHallAlarmDevice == 4)
{
startQuestTimer("room1_del", 100, npc, null);
startQuestTimer("room2_spawn", 100, npc, null);
@@ -1545,17 +1532,17 @@ public class Frintezza extends AbstractNpcAI
}
else if (npc.getId() == 18339)
{
- _KillDarkChoirPlayer++;
- if (_KillDarkChoirPlayer == 2)
+ _killDarkChoirPlayer++;
+ if (_killDarkChoirPlayer == 2)
{
DoorData.getInstance().getDoor(25150042).closeMe();
DoorData.getInstance().getDoor(25150043).closeMe();
DoorData.getInstance().getDoor(25150045).closeMe();
DoorData.getInstance().getDoor(25150046).closeMe();
int outside = 0;
- for (PlayerInstance room2_pc : _PlayersInside)
+ for (PlayerInstance room2_pc : _playersInside)
{
- if (_Zone.isInsideZone(room2_pc) && (room2_pc.getY() > -86130))
+ if (_zone.isInsideZone(room2_pc) && (room2_pc.getY() > -86130))
{
outside++;
}
@@ -1579,8 +1566,8 @@ public class Frintezza extends AbstractNpcAI
}
else if (npc.getId() == 18334)
{
- _KillDarkChoirCaptain++;
- if (_KillDarkChoirCaptain == 8)
+ _killDarkChoirCaptain++;
+ if (_killDarkChoirCaptain == 8)
{
startQuestTimer("room2_del", 100, npc, null);
@@ -1597,7 +1584,6 @@ public class Frintezza extends AbstractNpcAI
public static void main(String[] args)
{
- // now call the constructor (starts up the ai)
- new Frintezza(-1, "Frintezza", "ai");
+ new Frintezza();
}
}
\ No newline at end of file
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
index 52aee89bcf..6e09515271 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Orfen/Orfen.java
@@ -69,7 +69,7 @@ public class Orfen extends AbstractNpcAI
// private static final int RIBA = 29017;
private static final int RIBA_IREN = 29018;
- private static boolean _IsTeleported;
+ private static boolean _hasTeleported;
private static final Collection MINIONS = ConcurrentHashMap.newKeySet();
private static BossZone ZONE;
@@ -85,7 +85,7 @@ public class Orfen extends AbstractNpcAI
RIBA_IREN
};
registerMobs(mobs);
- _IsTeleported = false;
+ _hasTeleported = false;
ZONE = GrandBossManager.getInstance().getZone(POS[0]);
final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN);
if (GrandBossManager.getInstance().getBossStatus(ORFEN) == DEAD)
@@ -192,12 +192,12 @@ public class Orfen extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("check_orfen_pos"))
{
- if ((_IsTeleported && (npc.getCurrentHp() > (npc.getMaxHp() * 0.95))) || (!ZONE.isInsideZone(npc) && !_IsTeleported))
+ if ((_hasTeleported && (npc.getCurrentHp() > (npc.getMaxHp() * 0.95))) || (!ZONE.isInsideZone(npc) && !_hasTeleported))
{
setSpawnPoint(npc, getRandom(3) + 1);
- _IsTeleported = false;
+ _hasTeleported = false;
}
- else if (_IsTeleported && !ZONE.isInsideZone(npc))
+ else if (_hasTeleported && !ZONE.isInsideZone(npc))
{
setSpawnPoint(npc, 0);
}
@@ -290,9 +290,9 @@ public class Orfen extends AbstractNpcAI
final int npcId = npc.getId();
if (npcId == ORFEN)
{
- if (!_IsTeleported && ((npc.getCurrentHp() - damage) < (npc.getMaxHp() / 2)))
+ if (!_hasTeleported && ((npc.getCurrentHp() - damage) < (npc.getMaxHp() / 2)))
{
- _IsTeleported = true;
+ _hasTeleported = true;
setSpawnPoint(npc, 0);
}
else if (npc.isInsideRadius2D(attacker, 1000) && !npc.isInsideRadius2D(attacker, 300) && (getRandom(10) == 0))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
index d278ea8bf5..e913061528 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java
@@ -85,7 +85,7 @@ public class Valakas extends AbstractNpcAI
};
// Locations
- private static final Location TELEPORT_CUBE_LOCATIONS[] =
+ private static final Location[] TELEPORT_CUBE_LOCATIONS =
{
new Location(214880, -116144, -1644),
new Location(213696, -116592, -1644),
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
index e9d505d52a..aa8c5422a9 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java
@@ -1095,13 +1095,13 @@ public class CastleChamberlain extends AbstractNpcAI
{
if (isOwner(player, npc) && player.hasClanPrivilege(ClanPrivilege.CS_USE_FUNCTIONS))
{
- final CastleFunction HP = castle.getFunction(Castle.FUNC_RESTORE_HP);
- final CastleFunction MP = castle.getFunction(Castle.FUNC_RESTORE_MP);
- final CastleFunction XP = castle.getFunction(Castle.FUNC_RESTORE_EXP);
+ final CastleFunction hp = castle.getFunction(Castle.FUNC_RESTORE_HP);
+ final CastleFunction mp = castle.getFunction(Castle.FUNC_RESTORE_MP);
+ final CastleFunction xp = castle.getFunction(Castle.FUNC_RESTORE_EXP);
final NpcHtmlMessage html = getHtmlPacket(player, npc, "castledecofunction.html");
- html.replace("%HPDepth%", (HP == null) ? "0" : Integer.toString(HP.getLvl()));
- html.replace("%MPDepth%", (MP == null) ? "0" : Integer.toString(MP.getLvl()));
- html.replace("%XPDepth%", (XP == null) ? "0" : Integer.toString(XP.getLvl()));
+ html.replace("%HPDepth%", (hp == null) ? "0" : Integer.toString(hp.getLvl()));
+ html.replace("%MPDepth%", (mp == null) ? "0" : Integer.toString(mp.getLvl()));
+ html.replace("%XPDepth%", (xp == null) ? "0" : Integer.toString(xp.getLvl()));
player.sendPacket(html);
}
else
@@ -1132,12 +1132,9 @@ public class CastleChamberlain extends AbstractNpcAI
{
final int locId = Integer.parseInt(st.nextToken());
final TeleportLocation list = TeleportLocationTable.getInstance().getTemplate(locId);
- if (list != null)
+ if ((list != null) && takeItems(player, list.getItemId(), list.getPrice()))
{
- if (takeItems(player, list.getItemId(), list.getPrice()))
- {
- player.teleToLocation(list.getLocX(), list.getLocY(), list.getLocZ());
- }
+ player.teleToLocation(list.getLocX(), list.getLocY(), list.getLocZ());
}
}
else
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Katenar/Katenar.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Katenar/Katenar.java
index 29068eea93..68730e5c2a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Katenar/Katenar.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Katenar/Katenar.java
@@ -54,12 +54,9 @@ public class Katenar extends AbstractNpcAI
{
case "CREATED_50":
{
- if (npc0 != null)
+ if ((npc0 != null) && !npc.getVariables().getBoolean("SPAWNED", false))
{
- if (!npc.getVariables().getBoolean("SPAWNED", false))
- {
- npc0.getVariables().set("SPAWNED", false);
- }
+ npc0.getVariables().set("SPAWNED", false);
}
npc.deleteMe();
break;
@@ -69,13 +66,10 @@ public class Katenar extends AbstractNpcAI
final QuestState qs = player.getQuestState(Q00065_CertifiedSoulBreaker.class.getSimpleName());
if (qs.isMemoState(14))
{
- if (npc0 != null)
+ if ((npc0 != null) && !npc.getVariables().getBoolean("SPAWNED", false))
{
- if (!npc.getVariables().getBoolean("SPAWNED", false))
- {
- npc0.getVariables().set("SPAWNED", false);
- npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.GOOD_LUCK);
- }
+ npc0.getVariables().set("SPAWNED", false);
+ npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.GOOD_LUCK);
}
npc.deleteMe();
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Kier/Kier.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Kier/Kier.java
index 2b4c88241e..74a5a85843 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Kier/Kier.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Kier/Kier.java
@@ -42,12 +42,12 @@ public class Kier extends AbstractNpcAI
public String onFirstTalk(Npc npc, PlayerInstance player)
{
String htmltext = null;
- final QuestState st_Q00115 = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
- if (st_Q00115 == null)
+ final QuestState qs115 = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
+ if (qs115 == null)
{
htmltext = "32022-02.html";
}
- else if (!st_Q00115.isCompleted())
+ else if (!qs115.isCompleted())
{
htmltext = "32022-01.html";
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
index e79f6b547d..b588e12010 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/NpcBuffers/impl/CabaleBuffer.java
@@ -38,14 +38,14 @@ public class CabaleBuffer extends AbstractNpcAI
private static final int DISTANCE_TO_WATCH_OBJECT = 900;
// Messages
- public static final NpcStringId[] ORATOR_MSG =
+ protected static final NpcStringId[] ORATOR_MSG =
{
NpcStringId.THE_DAY_OF_JUDGMENT_IS_NEAR,
NpcStringId.THE_PROPHECY_OF_DARKNESS_HAS_BEEN_FULFILLED,
NpcStringId.AS_FORETOLD_IN_THE_PROPHECY_OF_DARKNESS_THE_ERA_OF_CHAOS_HAS_BEGUN,
NpcStringId.THE_PROPHECY_OF_DARKNESS_HAS_COME_TO_PASS
};
- public static final NpcStringId[] PREACHER_MSG =
+ protected static final NpcStringId[] PREACHER_MSG =
{
NpcStringId.THIS_WORLD_WILL_SOON_BE_ANNIHILATED,
NpcStringId.ALL_IS_LOST_PREPARE_TO_MEET_THE_GODDESS_OF_DEATH,
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java
index 50e681d763..2ff5c3fcaf 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PolymorphingOnAttack.java
@@ -88,23 +88,19 @@ public class PolymorphingOnAttack extends AbstractNpcAI
if (npc.isSpawned() && !npc.isDead())
{
final List tmp = MOBSPAWNS.get(npc.getId());
- if (tmp != null)
+ if ((tmp != null) && (npc.getCurrentHp() <= ((npc.getMaxHp() * tmp.get(1)) / 100.0)) && (getRandom(100) < tmp.get(2)))
{
- if ((npc.getCurrentHp() <= ((npc.getMaxHp() * tmp.get(1)) / 100.0)) && (getRandom(100) < tmp.get(2)))
+ if (tmp.get(3) >= 0)
{
- if (tmp.get(3) >= 0)
- {
- final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)];
- npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString));
-
- }
- npc.deleteMe();
- final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true);
- final Creature originalAttacker = isSummon ? attacker.getSummon() : attacker;
- newNpc.setRunning();
- newNpc.addDamageHate(originalAttacker, 0, 500);
- newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, originalAttacker);
+ final NpcStringId npcString = MOBTEXTS[tmp.get(3)][getRandom(MOBTEXTS[tmp.get(3)].length)];
+ npc.broadcastPacket(new CreatureSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getName(), npcString));
}
+ npc.deleteMe();
+ final Attackable newNpc = (Attackable) addSpawn(tmp.get(0), npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true);
+ final Creature originalAttacker = isSummon ? attacker.getSummon() : attacker;
+ newNpc.setRunning();
+ newNpc.addDamageHate(originalAttacker, 0, 500);
+ newNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, originalAttacker);
}
}
return super.onAttack(npc, attacker, damage, isSummon);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PrisonGuards.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PrisonGuards.java
index f7880786c2..938d18b41b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PrisonGuards.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/PrisonGuards.java
@@ -77,14 +77,11 @@ public class PrisonGuards extends AbstractNpcAI
{
if (player.isAffectedBySkill(TIMER))
{
- if ((getRandom(100) < 10) && (npc.calculateDistance3D(player) < 100))
+ if ((getRandom(100) < 10) && (npc.calculateDistance3D(player) < 100) && (getQuestItemsCount(player, STAMP) <= 3) && npc.isScriptValue(0))
{
- if ((getQuestItemsCount(player, STAMP) <= 3) && npc.isScriptValue(0))
- {
- giveItems(player, STAMP, 1);
- npc.setScriptValue(1);
- startQuestTimer("CLEAR_STATUS", 600000, npc, null);
- }
+ giveItems(player, STAMP, 1);
+ npc.setScriptValue(1);
+ startQuestTimer("CLEAR_STATUS", 600000, npc, null);
}
}
else
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Remnants.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Remnants.java
index c74d7f8370..4edc12f63f 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Remnants.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/Remnants.java
@@ -57,28 +57,19 @@ public class Remnants extends AbstractNpcAI
@Override
public String onSkillSee(Npc npc, PlayerInstance caster, Skill skill, WorldObject[] targets, boolean isSummon)
{
- if (skill.getId() == SKILL_HOLY_WATER)
+ if ((skill.getId() == SKILL_HOLY_WATER) && !npc.isDead() && (targets.length > 0) && (targets[0] == npc) && (npc.getCurrentHp() < (npc.getMaxHp() * 0.02)))
{
- if (!npc.isDead())
+ npc.doDie(caster);
+ //@formatter:off
+ /*if (npc.getNpcId() == DEREK)
{
- if ((targets.length > 0) && (targets[0] == npc))
- {
- if (npc.getCurrentHp() < (npc.getMaxHp() * 0.02)) // Lower, than 2%
- {
- npc.doDie(caster);
- //@formatter:off
- /*if (npc.getNpcId() == DEREK)
- {
- caster.sendMessage(MSG_DEREK);
- }
- else
- {
- caster.sendMessage(MSG);
- }*/
- //@formatter:on
- }
- }
+ caster.sendMessage(MSG_DEREK);
}
+ else
+ {
+ caster.sendMessage(MSG);
+ }*/
+ //@formatter:on
}
return super.onSkillSee(npc, caster, skill, targets, isSummon);
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SiegeGuards.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SiegeGuards.java
index 0254ea6a00..31fe606134 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SiegeGuards.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SiegeGuards.java
@@ -129,13 +129,10 @@ public class SiegeGuards extends AbstractNpcAI
{
final Summon summon = nearby.isSummon() ? (Summon) nearby : null;
final PlayerInstance pl = summon == null ? (PlayerInstance) nearby : summon.getOwner();
- if (((pl.getSiegeState() != 2) || pl.isRegisteredOnThisSiegeField(guard.getScriptValue())) && ((pl.getSiegeState() != 0) || (guard.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE)))
+ if (((pl.getSiegeState() != 2) || pl.isRegisteredOnThisSiegeField(guard.getScriptValue())) && ((pl.getSiegeState() != 0) || (guard.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE)) && (!pl.isInvisible() && !pl.isInvul()))
{
- if (!pl.isInvisible() && !pl.isInvul()) // skip invisible players
- {
- addAttackDesire(guard, pl);
- break; // no need to search more
- }
+ addAttackDesire(guard, pl);
+ break; // no need to search more
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java
index f045cf308e..238caf06e2 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/SubclassCertification/SubclassCertification.java
@@ -148,27 +148,27 @@ public class SubclassCertification extends AbstractNpcAI
}
case "lvl65Emergent":
{
- htmltext = doCertification(player, qs, "EmergentAbility", CERTIFICATE_EMERGENT_ABILITY, 65);
+ htmltext = doCertification(player, "EmergentAbility", CERTIFICATE_EMERGENT_ABILITY, 65);
break;
}
case "lvl70Emergent":
{
- htmltext = doCertification(player, qs, "EmergentAbility", CERTIFICATE_EMERGENT_ABILITY, 70);
+ htmltext = doCertification(player, "EmergentAbility", CERTIFICATE_EMERGENT_ABILITY, 70);
break;
}
case "lvl75Master":
{
- htmltext = doCertification(player, qs, "ClassAbility", CERTIFICATE_MASTER_ABILITY, 75);
+ htmltext = doCertification(player, "ClassAbility", CERTIFICATE_MASTER_ABILITY, 75);
break;
}
case "lvl75Class":
{
- htmltext = doCertification(player, qs, "ClassAbility", ABILITY_CERTIFICATES.get(getClassIndex(player)), 75);
+ htmltext = doCertification(player, "ClassAbility", ABILITY_CERTIFICATES.get(getClassIndex(player)), 75);
break;
}
case "lvl80Class":
{
- htmltext = doCertification(player, qs, "ClassAbility", TRANSFORMATION_SEALBOOKS.get(getClassIndex(player)), 80);
+ htmltext = doCertification(player, "ClassAbility", TRANSFORMATION_SEALBOOKS.get(getClassIndex(player)), 80);
break;
}
case "Main.html":
@@ -230,7 +230,7 @@ public class SubclassCertification extends AbstractNpcAI
return -1;
}
- private String doCertification(PlayerInstance player, QuestState qs, String variable, Integer itemId, int level)
+ private String doCertification(PlayerInstance player, String variable, Integer itemId, int level)
{
if (itemId == null)
{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java
index 0b19335ed8..85e3cda1e4 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java
@@ -51,16 +51,13 @@ public class TimakOrcTroopLeader extends AbstractNpcAI
if (npc.isMonster())
{
final MonsterInstance monster = (MonsterInstance) npc;
- if (!monster.isTeleporting())
+ if (!monster.isTeleporting() && (getRandom(1, 100) <= npc.getTemplate().getParameters().getInt("SummonPrivateRate", 0)))
{
- if (getRandom(1, 100) <= npc.getTemplate().getParameters().getInt("SummonPrivateRate", 0))
+ for (MinionHolder is : npc.getTemplate().getParameters().getMinionList("Privates"))
{
- for (MinionHolder is : npc.getTemplate().getParameters().getMinionList("Privates"))
- {
- addMinion((MonsterInstance) npc, is.getId());
- }
- npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
+ addMinion((MonsterInstance) npc, is.getId());
}
+ npc.broadcastSay(ChatType.NPC_GENERAL, getRandomEntry(ON_ATTACK_MSG));
}
}
return super.onAttack(npc, attacker, damage, isSummon);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
index e4054cad90..ab01be9c18 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java
@@ -37,8 +37,8 @@ import org.l2jmobius.gameserver.util.Util;
*/
public class FortressOfResistance extends ClanHallSiegeEngine
{
- private final int MESSENGER = 35382;
- private final int BLOODY_LORD_NURKA = 35375;
+ private static final int MESSENGER = 35382;
+ private static final int BLOODY_LORD_NURKA = 35375;
private final Location[] NURKA_COORDS =
{
@@ -84,8 +84,7 @@ public class FortressOfResistance extends ClanHallSiegeEngine
}
catch (Exception e)
{
- LOGGER.warning(getName() + ": Couldnt set the Bloody Lord Nurka spawn");
- e.printStackTrace();
+ LOGGER.warning(getName() + ": Couldnt set the Bloody Lord Nurka spawn " + e);
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
index 6cb9aeba14..c1a3f39eb6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -26,6 +26,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.concurrent.ScheduledFuture;
import org.l2jmobius.Config;
@@ -88,16 +89,16 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
{
long counter = 0;
Clan clan = null;
- for (int clanId : _warDecreesCount.keySet())
+ for (Entry entry : _warDecreesCount.entrySet())
{
- final Clan actingClan = ClanTable.getInstance().getClan(clanId);
+ final Clan actingClan = ClanTable.getInstance().getClan(entry.getKey());
if ((actingClan == null) || (actingClan.getDissolvingExpiryTime() > 0))
{
- _warDecreesCount.remove(clanId);
+ _warDecreesCount.remove(entry.getKey());
continue;
}
- final long count = _warDecreesCount.get(clanId);
+ final long count = entry.getValue();
if (count > counter)
{
counter = count;
@@ -144,7 +145,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
}
}
- public static Clan _winner;
+ public static final Clan _winner = null;
@Override
public Clan getWinner()
@@ -643,7 +644,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
final WorldObject target = player.getTarget();
- if ((target == null) || !(target instanceof Npc))
+ if (!(target instanceof Npc))
{
return null;
}
@@ -724,7 +725,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
}
catch (Exception e)
{
- e.printStackTrace();
+ LOGGER.warning("Problem at RainbowSpringsChateau: " + e.getMessage());
}
}
SpawnTable.getInstance().addNewSpawn(_gourds[i], false);
@@ -884,7 +885,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine
}
catch (Exception e)
{
- e.printStackTrace();
+ LOGGER.warning("Problem at RainbowSpringsChateau: " + e.getMessage());
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
index 1c8367e2f0..07ff471207 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java
@@ -131,8 +131,8 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
final Clan clan = ClanTable.getInstance().getClan(_hall.getOwnerId());
String content = getHtm(player, "messenger_initial.htm");
- content = content.replaceAll("%clanName%", (clan == null) ? "no owner" : clan.getName());
- content = content.replaceAll("%objectId%", String.valueOf(npc.getObjectId()));
+ content = content.replace("%clanName%", (clan == null) ? "no owner" : clan.getName());
+ content = content.replace("%objectId%", String.valueOf(npc.getObjectId()));
html = content;
}
else
@@ -360,11 +360,11 @@ public abstract class FlagWar extends ClanHallSiegeEngine
if (_hall.isInSiege())
{
final int npcId = npc.getId();
- for (int keys : _data.keySet())
+ for (Entry entry : _data.entrySet())
{
- if (_data.get(keys).npc == npcId)
+ if (entry.getValue().npc == npcId)
{
- removeParticipant(keys, true);
+ removeParticipant(entry.getKey(), true);
}
}
@@ -544,8 +544,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
catch (Exception e)
{
endSiege();
- LOGGER.warning(getName() + ": Problems in siege initialization!");
- e.printStackTrace();
+ LOGGER.warning(getName() + ": Problems in siege initialization! " + e);
}
}
}
@@ -569,14 +568,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
{
for (int clanId : _data.keySet())
{
- if (_hall.getOwnerId() == clanId)
- {
- removeParticipant(clanId, false);
- }
- else
- {
- removeParticipant(clanId, true);
- }
+ removeParticipant(clanId, _hall.getOwnerId() != clanId);
}
}
clearTables();
@@ -652,7 +644,6 @@ public abstract class FlagWar extends ClanHallSiegeEngine
catch (Exception e)
{
LOGGER.warning(getName() + ": Couldnt make clan spawns: " + e.getMessage());
- e.printStackTrace();
}
}
@@ -790,7 +781,6 @@ public abstract class FlagWar extends ClanHallSiegeEngine
catch (Exception e)
{
LOGGER.warning(getName() + ".loadAttackers()->" + e.getMessage());
- e.printStackTrace();
}
}
@@ -799,7 +789,6 @@ public abstract class FlagWar extends ClanHallSiegeEngine
try (Connection con = DatabaseFactory.getConnection())
{
final ArrayList listInstance = _data.get(clanId).players;
-
if (listInstance == null)
{
LOGGER.warning(getName() + ": Tried to load unregistered clan with ID " + clanId);
@@ -820,7 +809,6 @@ public abstract class FlagWar extends ClanHallSiegeEngine
catch (Exception e)
{
LOGGER.warning(getName() + ".loadAttackerMembers()->" + e.getMessage());
- e.printStackTrace();
}
}
@@ -839,7 +827,6 @@ public abstract class FlagWar extends ClanHallSiegeEngine
catch (Exception e)
{
LOGGER.warning(getName() + ".saveClan()->" + e.getMessage());
- e.printStackTrace();
}
}
@@ -856,7 +843,6 @@ public abstract class FlagWar extends ClanHallSiegeEngine
catch (Exception e)
{
LOGGER.warning(getName() + ".saveNpc()->" + e.getMessage());
- e.printStackTrace();
}
}
@@ -874,7 +860,6 @@ public abstract class FlagWar extends ClanHallSiegeEngine
catch (Exception e)
{
LOGGER.warning(getName() + ".saveMember()->" + e.getMessage());
- e.printStackTrace();
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
index 1f67fef12f..04d3411d8a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NewbieCoupons/NewbieCoupons.java
@@ -154,7 +154,7 @@ public class NewbieCoupons extends AbstractNpcAI
return "30598.htm";
}
- public static void main(String args[])
+ public static void main(String[] args)
{
new NewbieCoupons();
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
index 7fe44d4934..822cecfe2e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -311,7 +311,7 @@ public class NpcLocationInfo extends AbstractNpcAI
return htmltext;
}
- public static void main(String args[])
+ public static void main(String[] args)
{
new NpcLocationInfo();
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
index efc0a44ac8..8420caa973 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java
@@ -96,7 +96,7 @@ public class RaidbossInfo extends AbstractNpcAI
return "info.htm";
}
- public static void main(String args[])
+ public static void main(String[] args)
{
new RaidbossInfo();
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java
index 52bc269ae3..e046e7ea8a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/SellBuff/SellBuff.java
@@ -73,7 +73,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
public boolean useBypass(String command, PlayerInstance player, Creature target)
{
String cmd = "";
- String params = "";
+ StringBuilder params = new StringBuilder();
final StringTokenizer st = new StringTokenizer(command, " ");
if (st.hasMoreTokens())
@@ -83,14 +83,14 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
while (st.hasMoreTokens())
{
- params += st.nextToken() + (st.hasMoreTokens() ? " " : "");
+ params.append(st.nextToken() + (st.hasMoreTokens() ? " " : ""));
}
if (cmd.isEmpty())
{
return false;
}
- return useBypass(cmd, player, params);
+ return useBypass(cmd, player, params.toString());
}
@Override
@@ -130,11 +130,12 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
}
else
{
- String title = "BUFF SELL: ";
+ StringBuilder title = new StringBuilder();
+ title.append("BUFF SELL: ");
final StringTokenizer st = new StringTokenizer(params, " ");
while (st.hasMoreTokens())
{
- title += st.nextToken() + " ";
+ title.append(st.nextToken() + " ");
}
if (title.length() > 40)
@@ -143,7 +144,7 @@ public class SellBuff implements IVoicedCommandHandler, IBypassHandler
return false;
}
- SellBuffsManager.getInstance().startSellBuffs(player, title);
+ SellBuffsManager.getInstance().startSellBuffs(player, title.toString());
}
break;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
index de544f8ad5..0e4a926091 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java
@@ -53,16 +53,16 @@ public class ShadowWeapons extends AbstractNpcAI
public String onTalk(Npc npc, PlayerInstance player)
{
String htmltext;
- final boolean has_d = hasQuestItems(player, 8869); // Shadow Item Exchange Coupon (D-Grade)
- final boolean has_c = hasQuestItems(player, 8870); // Shadow Item Exchange Coupon (C-Grade)
+ final boolean hasD = hasQuestItems(player, 8869); // Shadow Item Exchange Coupon (D-Grade)
+ final boolean hasC = hasQuestItems(player, 8870); // Shadow Item Exchange Coupon (C-Grade)
- if (has_d || has_c)
+ if (hasD || hasC)
{
- if (!has_d)
+ if (!hasD)
{
htmltext = "exchange_c.html";
}
- else if (!has_c)
+ else if (!hasC)
{
htmltext = "exchange_d.html";
}
@@ -78,7 +78,7 @@ public class ShadowWeapons extends AbstractNpcAI
return htmltext;
}
- public static void main(String args[])
+ public static void main(String[] args)
{
new ShadowWeapons();
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
index ec37331e51..9ad750922e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -215,12 +215,9 @@ public class Rabbits extends Event
}
}
}
- else if (skill.getId() == RABBIT_MAGIC_EYE.getSkillId())
+ else if ((skill.getId() == RABBIT_MAGIC_EYE.getSkillId()) && npc.isInvisible() && npc.isInsideRadius2D(caster, skill.getAffectRange()))
{
- if (npc.isInvisible() && npc.isInsideRadius2D(caster, skill.getAffectRange()))
- {
- npc.setInvisible(false);
- }
+ npc.setInvisible(false);
}
return super.onSkillSee(npc, caster, skill, targets, isSummon);
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java
index 45f8cdc3b7..0dd0834282 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Race/Race.java
@@ -52,12 +52,12 @@ public class Race extends Event
// Race state
private static boolean _isRaceStarted = false;
// 5 min for register
- private static final int _time_register = 5;
+ private static final int REGISTER_TIME = 5;
// 5 min for race
- private static final int _time_race = 10;
+ private static final int RACE_TIME = 10;
// NPCs
- private static final int _start_npc = 900103;
- private static final int _stop_npc = 900104;
+ private static final int START_NPC = 900103;
+ private static final int STOP_NPC = 900104;
// Skills (Frog by default)
private static int _skill = 6201;
// We must keep second NPC spawn for radar
@@ -101,12 +101,12 @@ public class Race extends Event
private Race()
{
- addStartNpc(_start_npc);
- addFirstTalkId(_start_npc);
- addTalkId(_start_npc);
- addStartNpc(_stop_npc);
- addFirstTalkId(_stop_npc);
- addTalkId(_stop_npc);
+ addStartNpc(START_NPC);
+ addFirstTalkId(START_NPC);
+ addTalkId(START_NPC);
+ addStartNpc(STOP_NPC);
+ addFirstTalkId(STOP_NPC);
+ addTalkId(STOP_NPC);
}
@Override
@@ -129,14 +129,14 @@ public class Race extends Event
// Set Event active
_isactive = true;
// Spawn Manager
- _npc = recordSpawn(_start_npc, 18429, 145861, -3090, 0, false, 0);
+ _npc = recordSpawn(START_NPC, 18429, 145861, -3090, 0, false, 0);
// Announce event start
Broadcast.toAllOnlinePlayers("* Race Event started! *");
- Broadcast.toAllOnlinePlayers("Visit Event Manager in Dion village and signup, you have " + _time_register + " min before Race Start...");
+ Broadcast.toAllOnlinePlayers("Visit Event Manager in Dion village and signup, you have " + REGISTER_TIME + " min before Race Start...");
// Schedule Event end
- _eventTask = ThreadPool.schedule(() -> StartRace(), _time_register * 60 * 1000);
+ _eventTask = ThreadPool.schedule(this::StartRace, REGISTER_TIME * 60 * 1000);
return true;
@@ -159,7 +159,7 @@ public class Race extends Event
final int location = getRandom(0, _locations.length - 1);
_randspawn = _coords[location];
// And spawn NPC
- recordSpawn(_stop_npc, _randspawn[0], _randspawn[1], _randspawn[2], _randspawn[3], false, 0);
+ recordSpawn(STOP_NPC, _randspawn[0], _randspawn[1], _randspawn[2], _randspawn[3], false, 0);
// Transform players and send message
for (PlayerInstance player : _players)
{
@@ -179,7 +179,7 @@ public class Race extends Event
}
}
// Schedule timeup for Race
- _eventTask = ThreadPool.schedule(() -> timeUp(), _time_race * 60 * 1000);
+ _eventTask = ThreadPool.schedule(this::timeUp, RACE_TIME * 60 * 1000);
}
@Override
@@ -213,9 +213,9 @@ public class Race extends Event
}
_players.clear();
// Despawn NPCs
- for (Npc _npc : _npcs)
+ for (Npc npc : _npcs)
{
- _npc.deleteMe();
+ npc.deleteMe();
}
_npcs.clear();
// Announce event end
@@ -235,13 +235,13 @@ public class Race extends Event
}
else
{
- final int _number = Integer.valueOf(bypass.substring(5));
- final Skill _sk = SkillData.getInstance().getSkill(_number, 1);
- if (_sk != null)
+ final int number = Integer.valueOf(bypass.substring(5));
+ final Skill skill = SkillData.getInstance().getSkill(number, 1);
+ if (skill != null)
{
- _skill = _number;
+ _skill = number;
player.sendMessage("Transform skill set to:");
- player.sendMessage(_sk.getName());
+ player.sendMessage(skill.getName());
}
else
{
@@ -325,17 +325,17 @@ public class Race extends Event
{
getQuestState(player, true);
- if (npc.getId() == _start_npc)
+ if (npc.getId() == START_NPC)
{
if (_isRaceStarted)
{
- return _start_npc + "-started-" + isRacing(player) + ".htm";
+ return START_NPC + "-started-" + isRacing(player) + ".htm";
}
- return _start_npc + "-" + isRacing(player) + ".htm";
+ return START_NPC + "-" + isRacing(player) + ".htm";
}
- else if ((npc.getId() == _stop_npc) && _isRaceStarted)
+ else if ((npc.getId() == STOP_NPC) && _isRaceStarted)
{
- return _stop_npc + "-" + isRacing(player) + ".htm";
+ return STOP_NPC + "-" + isRacing(player) + ".htm";
}
return npc.getId() + ".htm";
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
index 7931fbb7d6..a17afb66f5 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java
@@ -85,23 +85,23 @@ public class TvTManager extends AbstractNpcAI implements IVoicedCommandHandler
else if ((playerLevel < Config.TVT_EVENT_MIN_LVL) || (playerLevel > Config.TVT_EVENT_MAX_LVL))
{
htmltext = getHtm(player, "Level.html");
- htmltext = htmltext.replaceAll("%min%", String.valueOf(Config.TVT_EVENT_MIN_LVL));
- htmltext = htmltext.replaceAll("%max%", String.valueOf(Config.TVT_EVENT_MAX_LVL));
+ htmltext = htmltext.replace("%min%", String.valueOf(Config.TVT_EVENT_MIN_LVL));
+ htmltext = htmltext.replace("%max%", String.valueOf(Config.TVT_EVENT_MAX_LVL));
}
else if ((team1Count == Config.TVT_EVENT_MAX_PLAYERS_IN_TEAMS) && (team2Count == Config.TVT_EVENT_MAX_PLAYERS_IN_TEAMS))
{
htmltext = getHtm(player, "TeamsFull.html");
- htmltext = htmltext.replaceAll("%max%", String.valueOf(Config.TVT_EVENT_MAX_PLAYERS_IN_TEAMS));
+ htmltext = htmltext.replace("%max%", String.valueOf(Config.TVT_EVENT_MAX_PLAYERS_IN_TEAMS));
}
else if ((Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.TVT_ID, player, Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP))
{
htmltext = getHtm(player, "IPRestriction.html");
- htmltext = htmltext.replaceAll("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP)));
+ htmltext = htmltext.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, Config.TVT_EVENT_MAX_PARTICIPANTS_PER_IP)));
}
else if (TvTEvent.needParticipationFee() && !TvTEvent.hasParticipationFee(player))
{
htmltext = getHtm(player, "ParticipationFee.html");
- htmltext = htmltext.replaceAll("%fee%", TvTEvent.getParticipationFee());
+ htmltext = htmltext.replace("%fee%", TvTEvent.getParticipationFee());
}
else if (TvTEvent.addParticipant(player))
{
@@ -138,16 +138,16 @@ public class TvTManager extends AbstractNpcAI implements IVoicedCommandHandler
final boolean isParticipant = TvTEvent.isPlayerParticipant(player.getObjectId());
final int[] teamsPlayerCounts = TvTEvent.getTeamsPlayerCounts();
htmltext = getHtm(player, (!isParticipant ? "Participation.html" : "RemoveParticipation.html"));
- htmltext = htmltext.replaceAll("%objectId%", String.valueOf(npc.getObjectId()));
- htmltext = htmltext.replaceAll("%team1name%", Config.TVT_EVENT_TEAM_1_NAME);
- htmltext = htmltext.replaceAll("%team1playercount%", String.valueOf(teamsPlayerCounts[0]));
- htmltext = htmltext.replaceAll("%team2name%", Config.TVT_EVENT_TEAM_2_NAME);
- htmltext = htmltext.replaceAll("%team2playercount%", String.valueOf(teamsPlayerCounts[1]));
- htmltext = htmltext.replaceAll("%playercount%", String.valueOf(teamsPlayerCounts[0] + teamsPlayerCounts[1]));
+ htmltext = htmltext.replace("%objectId%", String.valueOf(npc.getObjectId()));
+ htmltext = htmltext.replace("%team1name%", Config.TVT_EVENT_TEAM_1_NAME);
+ htmltext = htmltext.replace("%team1playercount%", String.valueOf(teamsPlayerCounts[0]));
+ htmltext = htmltext.replace("%team2name%", Config.TVT_EVENT_TEAM_2_NAME);
+ htmltext = htmltext.replace("%team2playercount%", String.valueOf(teamsPlayerCounts[1]));
+ htmltext = htmltext.replace("%playercount%", String.valueOf(teamsPlayerCounts[0] + teamsPlayerCounts[1]));
if (!isParticipant)
{
- htmltext = htmltext.replaceAll("%fee%", TvTEvent.getParticipationFee());
+ htmltext = htmltext.replace("%fee%", TvTEvent.getParticipationFee());
}
}
else if (TvTEvent.isStarting() || TvTEvent.isStarted())
@@ -199,12 +199,12 @@ public class TvTManager extends AbstractNpcAI implements IVoicedCommandHandler
final int[] teamsPlayerCounts = TvTEvent.getTeamsPlayerCounts();
final int[] teamsPointsCounts = TvTEvent.getTeamsPoints();
String htmltext = getHtm(player, "Status.html");
- htmltext = htmltext.replaceAll("%team1name%", Config.TVT_EVENT_TEAM_1_NAME);
- htmltext = htmltext.replaceAll("%team1playercount%", String.valueOf(teamsPlayerCounts[0]));
- htmltext = htmltext.replaceAll("%team1points%", String.valueOf(teamsPointsCounts[0]));
- htmltext = htmltext.replaceAll("%team2name%", Config.TVT_EVENT_TEAM_2_NAME);
- htmltext = htmltext.replaceAll("%team2playercount%", String.valueOf(teamsPlayerCounts[1]));
- htmltext = htmltext.replaceAll("%team2points%", String.valueOf(teamsPointsCounts[1]));
+ htmltext = htmltext.replace("%team1name%", Config.TVT_EVENT_TEAM_1_NAME);
+ htmltext = htmltext.replace("%team1playercount%", String.valueOf(teamsPlayerCounts[0]));
+ htmltext = htmltext.replace("%team1points%", String.valueOf(teamsPointsCounts[0]));
+ htmltext = htmltext.replace("%team2name%", Config.TVT_EVENT_TEAM_2_NAME);
+ htmltext = htmltext.replace("%team2playercount%", String.valueOf(teamsPlayerCounts[1]));
+ htmltext = htmltext.replace("%team2points%", String.valueOf(teamsPointsCounts[1]));
return htmltext;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Wedding/Wedding.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Wedding/Wedding.java
index 1b9ad77b9b..d25e8dc9ff 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Wedding/Wedding.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/custom/events/Wedding/Wedding.java
@@ -85,7 +85,7 @@ public class Wedding extends AbstractNpcAI
player.setMarryRequest(false);
partner.setMarryRequest(false);
htmltext = getHtm(player, "Ask.html");
- htmltext = htmltext.replaceAll("%player%", partner.getName());
+ htmltext = htmltext.replace("%player%", partner.getName());
}
return htmltext;
}
@@ -106,7 +106,7 @@ public class Wedding extends AbstractNpcAI
sendHtml(partner, "Ask.html", "%player%", player.getName());
htmltext = getHtm(player, "Requested.html");
- htmltext = htmltext.replaceAll("%player%", partner.getName());
+ htmltext = htmltext.replace("%player%", partner.getName());
}
break;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
index 13c1d183a2..26e7779b74 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java
@@ -37,10 +37,9 @@ import ai.AbstractNpcAI;
public class CharacterBirthday extends AbstractNpcAI
{
+ // Npcs
private static final int ALEGRIA = 32600;
- private static boolean is_spawned = false;
-
- private final static int[] GK =
+ private static final int[] GATEKEEPERS =
{
30006,
30059,
@@ -62,13 +61,15 @@ public class CharacterBirthday extends AbstractNpcAI
31964,
32163
};
+ // Misc
+ private static boolean HAS_SPAWNED = false;
private CharacterBirthday()
{
addStartNpc(ALEGRIA);
addFirstTalkId(ALEGRIA);
addTalkId(ALEGRIA);
- for (int id : GK)
+ for (int id : GATEKEEPERS)
{
addStartNpc(id);
addTalkId(id);
@@ -85,7 +86,7 @@ public class CharacterBirthday extends AbstractNpcAI
if (event.equalsIgnoreCase("despawn_npc"))
{
npc.doDie(player);
- is_spawned = false;
+ HAS_SPAWNED = false;
htmltext = null;
}
if (event.equalsIgnoreCase("receive_reward"))
@@ -93,8 +94,8 @@ public class CharacterBirthday extends AbstractNpcAI
Calendar now = Calendar.getInstance();
now.setTimeInMillis(System.currentTimeMillis());
// Check if already received reward
- String NextBirthday = st.get("Birthday");
- if ((NextBirthday != null) && (Integer.valueOf(NextBirthday) > now.get(Calendar.YEAR)))
+ String nextBirthday = st.get("Birthday");
+ if ((nextBirthday != null) && (Integer.valueOf(nextBirthday) > now.get(Calendar.YEAR)))
{
htmltext = "32600-already.htm";
}
@@ -115,7 +116,7 @@ public class CharacterBirthday extends AbstractNpcAI
// Despawn npc
npc.doDie(player);
- is_spawned = false;
+ HAS_SPAWNED = false;
// Update for next year
st.set("Birthday", String.valueOf(now.get(Calendar.YEAR) + 1));
@@ -129,7 +130,7 @@ public class CharacterBirthday extends AbstractNpcAI
@Override
public String onTalk(Npc npc, PlayerInstance player)
{
- if (is_spawned)
+ if (HAS_SPAWNED)
{
return null;
}
@@ -142,7 +143,7 @@ public class CharacterBirthday extends AbstractNpcAI
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);
- is_spawned = true;
+ HAS_SPAWNED = true;
}
else
{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
index 050db799c6..ab249a5591 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java
@@ -114,24 +114,24 @@ public class HeavyMedal extends LongTimeEvent
public int checkLevel(PlayerInstance player)
{
- int _lev = 0;
+ int level = 0;
if (hasQuestItems(player, 6402))
{
- _lev = 4;
+ level = 4;
}
else if (hasQuestItems(player, 6401))
{
- _lev = 3;
+ level = 3;
}
else if (hasQuestItems(player, 6400))
{
- _lev = 2;
+ level = 2;
}
else if (hasQuestItems(player, 6399))
{
- _lev = 1;
+ level = 1;
}
- return _lev;
+ return level;
}
public static void main(String[] args)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
index 48ba6580dd..178632c25c 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java
@@ -16,8 +16,6 @@
*/
package events.MasterOfEnchanting;
-import java.util.Date;
-
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.itemcontainer.Inventory;
@@ -62,9 +60,6 @@ public class MasterOfEnchanting extends LongTimeEvent
9572
};
- @SuppressWarnings("deprecation")
- private static final Date EVENT_START = new Date(2011, 7, 1);
-
private MasterOfEnchanting()
{
addStartNpc(MASTER_YOGI);
@@ -93,8 +88,8 @@ public class MasterOfEnchanting extends LongTimeEvent
{
final long curTime = System.currentTimeMillis();
final String value = player.getVariables().getString("MasterOfEnchanting");
- final long reuse = value == "" ? 0 : Long.parseLong(value);
- if (player.getCreateDate().after(EVENT_START))
+ final long reuse = value.equals("") ? 0 : Long.parseLong(value);
+ if (player.getCreateDate().after(getEventPeriod().getStartDate()))
{
return "32599-bidth.htm";
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/SavingSanta/SavingSanta.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
index cf6f72c703..518e8dcd9a 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/events/SavingSanta/SavingSanta.java
@@ -307,12 +307,9 @@ public class SavingSanta extends LongTimeEvent
if (event.equalsIgnoreCase("ThomasQuest"))
{
startQuestTimer("ThomasQuest", 14400000, null, null);
- Npc ThomasDTurkey = addSpawn(THOMAS_D_TURKEY_ID, THOMAS_SPAWN.getX(), THOMAS_SPAWN.getY(), THOMAS_SPAWN.getZ(), THOMAS_SPAWN.getHeading(), false, 1800000);
-
+ final Npc thomas = addSpawn(THOMAS_D_TURKEY_ID, THOMAS_SPAWN.getX(), THOMAS_SPAWN.getY(), THOMAS_SPAWN.getZ(), THOMAS_SPAWN.getHeading(), false, 1800000);
Broadcast.toAllOnlinePlayers(new SystemMessage(SystemMessageId.THOMAS_D_TURKEY_HAS_APPEARED_PLEASE_SAVE_SANTA));
-
- startQuestTimer("ThomasCast1", 15000, ThomasDTurkey, null);
-
+ startQuestTimer("ThomasCast1", 15000, thomas, null);
_isSantaFree = false;
}
else if (event.equalsIgnoreCase("SantaSpawn"))
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/MasterHandler.java
index 4e77a2e77d..5749550cba 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/MasterHandler.java
@@ -132,7 +132,6 @@ import handlers.admincommandhandlers.AdminTerritoryWar;
import handlers.admincommandhandlers.AdminTest;
import handlers.admincommandhandlers.AdminTransform;
import handlers.admincommandhandlers.AdminTvTEvent;
-import handlers.admincommandhandlers.AdminUnblockIp;
import handlers.admincommandhandlers.AdminVitality;
import handlers.admincommandhandlers.AdminZone;
import handlers.admincommandhandlers.AdminZones;
@@ -433,7 +432,6 @@ public class MasterHandler
AdminTest.class,
AdminTransform.class,
AdminTvTEvent.class,
- AdminUnblockIp.class,
AdminVitality.class,
AdminZone.class,
},
@@ -627,12 +625,9 @@ public class MasterHandler
}
}
- registerHandlerMethods.entrySet().stream().filter(e -> e.getValue() == null).forEach(e ->
- {
- LOGGER.log(Level.WARNING, "Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist.");
- });
+ registerHandlerMethods.entrySet().stream().filter(e -> e.getValue() == null).forEach(e -> LOGGER.log(Level.WARNING, "Failed loading handlers of: " + e.getKey().getClass().getSimpleName() + " seems registerHandler function does not exist."));
- for (Class classes[] : HANDLERS)
+ for (Class[] classes : HANDLERS)
{
for (Class c : classes)
{
@@ -655,7 +650,6 @@ public class MasterHandler
catch (Exception e)
{
LOGGER.log(Level.WARNING, "Failed loading handler: " + c.getSimpleName(), e);
- continue;
}
}
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionhandlers/ArtefactInstanceAction.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionhandlers/ArtefactInstanceAction.java
index cf6a4751b9..1541ea5821 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionhandlers/ArtefactInstanceAction.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionhandlers/ArtefactInstanceAction.java
@@ -50,14 +50,10 @@ public class ArtefactInstanceAction implements IActionHandler
{
player.setTarget(target);
}
- else if (interact)
+ else if (interact && !((Npc) target).canInteract(player)) // Calculate the distance between the PlayerInstance and the NpcInstance
{
- // Calculate the distance between the PlayerInstance and the NpcInstance
- if (!((Npc) target).canInteract(player))
- {
- // Notify the PlayerInstance AI with AI_INTENTION_INTERACT
- player.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, target);
- }
+ // Notify the PlayerInstance AI with AI_INTENTION_INTERACT
+ player.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, target);
}
return true;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java
index f64e5d416b..d5ad70b65d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/actionshifthandlers/NpcActionShift.java
@@ -142,7 +142,7 @@ public class NpcActionShift implements IActionShiftHandler
}
final String spawnFile = SpawnTable.getInstance().getSpawnFile(((Npc) target).getSpawn().getNpcSpawnTemplateId());
- html.replace("%spawnfile%", spawnFile.substring(spawnFile.lastIndexOf("\\") + 1));
+ html.replace("%spawnfile%", spawnFile.substring(spawnFile.lastIndexOf('\\') + 1));
}
else
{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
index fa831ccbd7..c51c6905be 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java
@@ -308,6 +308,7 @@ public class AdminAdmin implements IAdminCommandHandler
}
catch (Exception e)
{
+ // Not important.
}
switch (mode)
{
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java
index 1e95720ce2..42a182b331 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminAnnouncements.java
@@ -207,13 +207,13 @@ public class AdminAnnouncements implements IAdminCommandHandler
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
}
- content = content.replaceAll("%id%", announcementId);
- content = content.replaceAll("%type%", announcementType);
- content = content.replaceAll("%initial%", announcementInital);
- content = content.replaceAll("%delay%", announcementDelay);
- content = content.replaceAll("%repeat%", announcementRepeat);
- content = content.replaceAll("%author%", announcementAuthor);
- content = content.replaceAll("%content%", announcementContent);
+ content = content.replace("%id%", announcementId);
+ content = content.replace("%type%", announcementType);
+ content = content.replace("%initial%", announcementInital);
+ content = content.replace("%delay%", announcementDelay);
+ content = content.replace("%repeat%", announcementRepeat);
+ content = content.replace("%author%", announcementAuthor);
+ content = content.replace("%content%", announcementContent);
Util.sendCBHtml(activeChar, content);
break;
}
@@ -433,13 +433,13 @@ public class AdminAnnouncements implements IAdminCommandHandler
announcementDelay = Long.toString(autoAnnounce.getDelay() / 1000);
announcementRepeat = Integer.toString(autoAnnounce.getRepeat());
}
- content = content.replaceAll("%id%", announcementId);
- content = content.replaceAll("%type%", announcementType);
- content = content.replaceAll("%initial%", announcementInital);
- content = content.replaceAll("%delay%", announcementDelay);
- content = content.replaceAll("%repeat%", announcementRepeat);
- content = content.replaceAll("%author%", announcementAuthor);
- content = content.replaceAll("%content%", announcementContent);
+ content = content.replace("%id%", announcementId);
+ content = content.replace("%type%", announcementType);
+ content = content.replace("%initial%", announcementInital);
+ content = content.replace("%delay%", announcementDelay);
+ content = content.replace("%repeat%", announcementRepeat);
+ content = content.replace("%author%", announcementAuthor);
+ content = content.replace("%content%", announcementContent);
Util.sendCBHtml(activeChar, content);
break;
}
@@ -493,8 +493,8 @@ public class AdminAnnouncements implements IAdminCommandHandler
sb.append("");
return sb.toString();
});
- content = content.replaceAll("%pages%", result.getPagerTemplate().toString());
- content = content.replaceAll("%announcements%", result.getBodyTemplate().toString());
+ content = content.replace("%pages%", result.getPagerTemplate().toString());
+ content = content.replace("%announcements%", result.getBodyTemplate().toString());
Util.sendCBHtml(activeChar, content);
break;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
index 2604ccfc2b..2d782b3002 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java
@@ -360,6 +360,7 @@ public class AdminBuffs implements IAdminCommandHandler
}
catch (Exception e)
{
+ // Checked bellow.
}
if ((target != null) && (skillId > 0))
@@ -387,6 +388,7 @@ public class AdminBuffs implements IAdminCommandHandler
}
catch (Exception e)
{
+ // Checked bellow.
}
if (target != null)
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java
index 07193629ba..6a05789e27 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCHSiege.java
@@ -17,6 +17,7 @@
package handlers.admincommandhandlers;
import java.util.Calendar;
+import java.util.logging.Logger;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.sql.impl.ClanTable;
@@ -36,6 +37,8 @@ import org.l2jmobius.gameserver.util.BuilderUtil;
*/
public class AdminCHSiege implements IAdminCommandHandler
{
+ private static final Logger LOGGER = Logger.getLogger(AdminCHSiege.class.getName());
+
private static final String[] COMMANDS =
{
"admin_chsiege_siegablehall",
@@ -355,7 +358,7 @@ public class AdminCHSiege implements IAdminCommandHandler
}
catch (NumberFormatException e)
{
- e.printStackTrace();
+ LOGGER.warning("Problem with AdminCHSiege: " + e.getMessage());
}
return val;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
index d4e90394e3..01eca2af58 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminCursedWeapons.java
@@ -45,8 +45,6 @@ public class AdminCursedWeapons implements IAdminCommandHandler
"admin_cw_info_menu"
};
- private int itemId;
-
@Override
public boolean useAdminCommand(String command, PlayerInstance activeChar)
{
@@ -94,7 +92,7 @@ public class AdminCursedWeapons implements IAdminCommandHandler
adminReply.setFile(activeChar, "data/html/admin/cwinfo.htm");
for (CursedWeapon cw : cwm.getCursedWeapons())
{
- itemId = cw.getItemId();
+ final int itemId = cw.getItemId();
replyMSG.append("
Name:
");
replyMSG.append(cw.getName());
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java
index 591e3e8fe8..6562a8224d 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java
@@ -17,6 +17,7 @@
package handlers.admincommandhandlers;
import java.awt.Color;
+import java.util.logging.Logger;
import org.l2jmobius.gameserver.data.xml.impl.DoorData;
import org.l2jmobius.gameserver.handler.IAdminCommandHandler;
@@ -36,7 +37,10 @@ import org.l2jmobius.gameserver.util.BuilderUtil;
*/
public class AdminDoorControl implements IAdminCommandHandler
{
+ private static final Logger LOGGER = Logger.getLogger(AdminDoorControl.class.getName());
+
private static DoorData _doorTable = DoorData.getInstance();
+
private static final String[] ADMIN_COMMANDS =
{
"admin_open",
@@ -168,7 +172,7 @@ public class AdminDoorControl implements IAdminCommandHandler
}
catch (Exception e)
{
- e.printStackTrace();
+ LOGGER.warning("Problem with AdminDoorControl: " + e.getMessage());
}
return true;
}
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
index 05f6e6d740..1495842742 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java
@@ -646,7 +646,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
catch (Exception e)
{
- e.printStackTrace();
+ LOGGER.warning("Problem with AdminEditChar: " + e.getMessage());
}
}
else if (command.startsWith("admin_find_dualbox"))
@@ -664,6 +664,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
catch (Exception e)
{
+ // Handled above.
}
findDualbox(activeChar, multibox);
}
@@ -682,6 +683,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
catch (Exception e)
{
+ // Handled above.
}
findDualboxStrict(activeChar, multibox);
}
@@ -786,6 +788,7 @@ public class AdminEditChar implements IAdminCommandHandler
}
catch (Exception e)
{
+ LOGGER.warning("Problem with AdminEditChar: " + e.getMessage());
}
}
else
@@ -1148,11 +1151,11 @@ public class AdminEditChar implements IAdminCommandHandler
/**
* @param activeChar
- * @param CharacterToFind
+ * @param characterToFind
*/
- private void findCharacter(PlayerInstance activeChar, String CharacterToFind)
+ private void findCharacter(PlayerInstance activeChar, String characterToFind)
{
- int CharactersFound = 0;
+ int charactersFound = 0;
String name;
final NpcHtmlMessage adminReply = new NpcHtmlMessage();
adminReply.setFile(activeChar, "data/html/admin/charfind.htm");
@@ -1164,9 +1167,9 @@ public class AdminEditChar implements IAdminCommandHandler
for (PlayerInstance player : players)
{ // Add player info into new Table row
name = player.getName();
- if (name.toLowerCase().contains(CharacterToFind.toLowerCase()))
+ if (name.toLowerCase().contains(characterToFind.toLowerCase()))
{
- CharactersFound += 1;
+ charactersFound += 1;
replyMSG.append("