| Name: | "); replyMSG.append(cw.getName()); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java index 591e3e8fe8..6562a8224d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminDoorControl.java +++ b/L2J_Mobius_CT_2.6_HighFive/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.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java index 450438849e..9602ff0f68 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java @@ -654,7 +654,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")) @@ -672,6 +672,7 @@ public class AdminEditChar implements IAdminCommandHandler } catch (Exception e) { + // Handled above. } findDualbox(activeChar, multibox); } @@ -690,6 +691,7 @@ public class AdminEditChar implements IAdminCommandHandler } catch (Exception e) { + // Handled above. } findDualboxStrict(activeChar, multibox); } @@ -794,6 +796,7 @@ public class AdminEditChar implements IAdminCommandHandler } catch (Exception e) { + LOGGER.warning("Problem with AdminEditChar: " + e.getMessage()); } } else @@ -1156,11 +1159,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"); @@ -1172,9 +1175,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(" | ||
| "); @@ -1185,7 +1188,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(" | |||
| "); @@ -1289,7 +1291,7 @@ public class AdminEditChar implements IAdminCommandHandler replyMSG.append(player.getLevel()); replyMSG.append(" |
Instances for " + player.getName() + "
| Name | Time | Action |
| " + InstanceManager.getInstance().getInstanceIdName(id) + " | " + hours + ":" + minutes + " | |
| " + InstanceManager.getInstance().getInstanceIdName(entry.getKey()) + " | " + hours + ":" + minutes + " |
-
- *
- admin_unblockip - *
"; + localisation = "[" + nsl.getLocalisation(Collections.emptyList()) + " (Sponsor)]
"; } } } @@ -185,7 +186,7 @@ public class QuestLink implements IBypassHandler final NSLocalisation nsl = ns.getLocalisation(player.getLang()); if (nsl != null) { - localisation = "[" + nsl.getLocalisation(Collections.EMPTY_LIST) + " (Sponsor)]
"; + localisation = "[" + nsl.getLocalisation(Collections.emptyList()) + " (Sponsor)]
"; } } } @@ -228,19 +229,12 @@ public class QuestLink implements IBypassHandler return; } - if (qs == null) + if ((qs == null) && (q.getId() >= 1) && (q.getId() < 20000) && (player.getAllActiveQuests().size() > 40)) { - if ((q.getId() >= 1) && (q.getId() < 20000)) - { - // Too many ongoing quests. - if (player.getAllActiveQuests().size() > 40) - { - final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); - html.setFile(player, "data/html/fullquest.html"); - player.sendPacket(html); - return; - } - } + final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); + html.setFile(player, "data/html/fullquest.html"); + player.sendPacket(html); + return; } q.notifyTalk(npc, player); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java index e495ec719d..cbf8de602c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java @@ -91,14 +91,14 @@ public class RentPet implements IBypassHandler int petId; double price = 1; - final int cost[] = + final int[] cost = { 1800, 7200, 720000, 6480000 }; - final int ridetime[] = + final int[] ridetime = { 30, 60, diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java index 2f1ceb9dc7..5062bd09c4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java @@ -56,21 +56,21 @@ public class SkillList implements IBypassHandler } else { - boolean own_class = false; + boolean ownClass = false; final List
"; - if (!own_class) + if (!ownClass) { final String charType = player.getClassId().isMage() ? "fighter" : "mage"; text += "Skills of your class are the easiest to learn.
Skills of another class of your race are a little harder.
Skills for classes of another race are extremely difficult.
But the hardest of all to learn are the " + charType + "skills!
"; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/VoiceCommand.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/VoiceCommand.java index 80c9037018..c11ea8c5fe 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/VoiceCommand.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/VoiceCommand.java @@ -40,7 +40,7 @@ public class VoiceCommand implements IBypassHandler { final String vc; final String vparams; - final int endOfCommand = command.indexOf(" ", 7); + final int endOfCommand = command.indexOf(' ', 7); if (endOfCommand > 0) { vc = command.substring(7, endOfCommand).trim(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java index ee8c3f034e..a75c0fb87a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatGeneral.java @@ -44,7 +44,7 @@ public class ChatGeneral implements IChatHandler @Override public void handleChat(ChatType type, PlayerInstance activeChar, String params, String text) { - boolean vcd_used = false; + boolean vcdUsed = false; if (text.startsWith(".")) { final StringTokenizer st = new StringTokenizer(text); @@ -64,15 +64,15 @@ public class ChatGeneral implements IChatHandler if (vch != null) { vch.useVoicedCommand(command, activeChar, params); - vcd_used = true; + vcdUsed = true; } else { - vcd_used = false; + vcdUsed = false; } } - if (!vcd_used) + if (!vcdUsed) { if (activeChar.isChatBanned() && Config.BAN_CHAT_CHANNELS.contains(type)) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java index 88f67549bb..6cc581ce7c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatPartyMatchRoom.java @@ -44,8 +44,8 @@ public class ChatPartyMatchRoom implements IChatHandler { return; } - final PartyMatchRoom _room = PartyMatchRoomList.getInstance().getPlayerRoom(activeChar); - if (_room == null) + final PartyMatchRoom room = PartyMatchRoomList.getInstance().getPlayerRoom(activeChar); + if (room == null) { return; } @@ -61,25 +61,25 @@ public class ChatPartyMatchRoom implements IChatHandler } final CreatureSay cs = new CreatureSay(activeChar.getObjectId(), type, activeChar.getName(), text); - for (PlayerInstance _member : _room.getPartyMembers()) + for (PlayerInstance member : room.getPartyMembers()) { if (Config.FACTION_SYSTEM_ENABLED) { if (Config.FACTION_SPECIFIC_CHAT) { - if ((activeChar.isGood() && _member.isGood()) || (activeChar.isEvil() && _member.isEvil())) + if ((activeChar.isGood() && member.isGood()) || (activeChar.isEvil() && member.isEvil())) { - _member.sendPacket(cs); + member.sendPacket(cs); } } else { - _member.sendPacket(cs); + member.sendPacket(cs); } } else { - _member.sendPacket(cs); + member.sendPacket(cs); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatShout.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatShout.java index b03334d022..ea2d22f0b8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatShout.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/chathandlers/ChatShout.java @@ -63,7 +63,7 @@ public class ChatShout implements IChatHandler final int region = MapRegionManager.getInstance().getMapRegionLocId(activeChar); for (PlayerInstance player : World.getInstance().getPlayers()) { - if ((region == MapRegionManager.getInstance().getMapRegionLocId(player)) && !BlockList.isBlocked(player, activeChar) && (player.getInstanceId() == activeChar.getInstanceId()) && !BlockList.isBlocked(player, activeChar)) + if ((region == MapRegionManager.getInstance().getMapRegionLocId(player)) && !BlockList.isBlocked(player, activeChar) && (player.getInstanceId() == activeChar.getInstanceId()) && !BlockList.isBlocked(activeChar, player)) { if (Config.FACTION_SYSTEM_ENABLED) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java index 5a6df57a1f..524ed50686 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/communityboard/DropSearchBoard.java @@ -89,7 +89,8 @@ public class DropSearchBoard implements IParseBoardHandler private final Map
* Line Format: {OFFSET} {HEXADECIMAL} {ASCII}({NEWLINE})
* {OFFSET} = offset of the first byte in line(8 chars)
- * {HEXADECIMAL} = hexadecimal character representation({@link #_HEX_ED_BPL}*2 chars)
- * {ASCII} = ascii character presentation({@link #_HEX_ED_BPL} chars) + * {HEXADECIMAL} = hexadecimal character representation({@link #HEX_ED_BPL}*2 chars)
+ * {ASCII} = ascii character presentation({@link #HEX_ED_BPL} chars) * @param data byte array to generate the hexadecimal character representation * @param len the number of bytes to generate the hexadecimal character representation from * @return byte array which contains the hexadecimal character representation of the given byte array @@ -196,8 +196,8 @@ public class HexUtils public static char[] bArr2HexEdChars(byte[] data, int len) { // {OFFSET} {HEXADECIMAL} {ASCII}{NEWLINE} - final int lineLength = 9 + (_HEX_ED_BPL * _HEX_ED_CPB) + 1 + _HEX_ED_BPL + _NEW_LINE_CHARS.length; - final int lenBplMod = len % _HEX_ED_BPL; + final int lineLength = 9 + (HEX_ED_BPL * HEX_ED_CPB) + 1 + HEX_ED_BPL + _NEW_LINE_CHARS.length; + final int lenBplMod = len % HEX_ED_BPL; // create text buffer // 1. don't allocate a full last line if not _HEX_ED_BPL bytes are shown in last line // 2. no new line at end of buffer @@ -208,13 +208,13 @@ public class HexUtils char[] textData; if (lenBplMod == 0) { - numLines = len / _HEX_ED_BPL; + numLines = len / HEX_ED_BPL; textData = new char[(lineLength * numLines) - _NEW_LINE_CHARS.length]; } else { - numLines = (len / _HEX_ED_BPL) + 1; - textData = new char[(lineLength * numLines) - (_HEX_ED_BPL - (lenBplMod)) - _NEW_LINE_CHARS.length]; + numLines = (len / HEX_ED_BPL) + 1; + textData = new char[(lineLength * numLines) - (HEX_ED_BPL - (lenBplMod)) - _NEW_LINE_CHARS.length]; } // performance penalty, only doing space filling in the loop is faster @@ -227,11 +227,11 @@ public class HexUtils int lineAsciiDataStart; for (int i = 0; i < numLines; ++i) { - dataOffset = i * _HEX_ED_BPL; - dataLen = Math.min(len - dataOffset, _HEX_ED_BPL); + dataOffset = i * HEX_ED_BPL; + dataLen = Math.min(len - dataOffset, HEX_ED_BPL); lineStart = i * lineLength; lineHexDataStart = lineStart + 9; - lineAsciiDataStart = lineHexDataStart + (_HEX_ED_BPL * _HEX_ED_CPB) + 1; + lineAsciiDataStart = lineHexDataStart + (HEX_ED_BPL * HEX_ED_CPB) + 1; int2HexChars(dataOffset, textData, lineStart); // the offset of this line textData[lineHexDataStart - 1] = ' '; // separate @@ -241,13 +241,13 @@ public class HexUtils if (i < (numLines - 1)) { textData[lineAsciiDataStart - 1] = ' '; // separate - System.arraycopy(_NEW_LINE_CHARS, 0, textData, lineAsciiDataStart + _HEX_ED_BPL, _NEW_LINE_CHARS.length); // the new line + System.arraycopy(_NEW_LINE_CHARS, 0, textData, lineAsciiDataStart + HEX_ED_BPL, _NEW_LINE_CHARS.length); // the new line } - else if (dataLen < _HEX_ED_BPL) + else if (dataLen < HEX_ED_BPL) { // last line which shows less than _HEX_ED_BPL bytes - final int lineHexDataEnd = lineHexDataStart + (dataLen * _HEX_ED_CPB); - Arrays.fill(textData, lineHexDataEnd, lineHexDataEnd + ((_HEX_ED_BPL - dataLen) * _HEX_ED_CPB) + 1, ' '); // spaces, for the last line if there are not _HEX_ED_BPL bytes + final int lineHexDataEnd = lineHexDataStart + (dataLen * HEX_ED_CPB); + Arrays.fill(textData, lineHexDataEnd, lineHexDataEnd + ((HEX_ED_BPL - dataLen) * HEX_ED_CPB) + 1, ' '); // spaces, for the last line if there are not _HEX_ED_BPL bytes } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/IPSubnet.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/IPSubnet.java index 0de2b104e7..82c2f5d2da 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/IPSubnet.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/IPSubnet.java @@ -25,9 +25,9 @@ public class IPSubnet private final byte[] _mask; private final boolean _isIPv4; - public IPSubnet(String input) throws UnknownHostException, NumberFormatException, ArrayIndexOutOfBoundsException + public IPSubnet(String input) throws UnknownHostException { - final int idx = input.indexOf("/"); + final int idx = input.indexOf('/'); if (idx > 0) { _addr = InetAddress.getByName(input.substring(0, idx)).getAddress(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/IXmlReader.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/IXmlReader.java index c3fd55501b..942af67453 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/IXmlReader.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/IXmlReader.java @@ -104,12 +104,10 @@ public interface IXmlReader catch (SAXParseException e) { LOGGER.log(Level.WARNING, "Could not parse file: " + f.getName() + " at line: " + e.getLineNumber() + ", column: " + e.getColumnNumber() + " :", e); - return; } catch (Exception e) { LOGGER.log(Level.WARNING, "Could not parse file: " + f.getName(), e); - return; } } @@ -178,10 +176,7 @@ public interface IXmlReader } else if (getCurrentFileFilter().accept(file)) { - jobs.add(ThreadPool.schedule(() -> - { - parseFile(file); - }, 0)); + jobs.add(ThreadPool.schedule(() -> parseFile(file), 0)); } } while (!jobs.isEmpty()) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/LimitLinesDocumentListener.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/LimitLinesDocumentListener.java index 228014d99d..1a5a5bac4a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/LimitLinesDocumentListener.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/LimitLinesDocumentListener.java @@ -91,11 +91,13 @@ public class LimitLinesDocumentListener implements DocumentListener @Override public void removeUpdate(DocumentEvent e) { + // Ignore. } @Override public void changedUpdate(DocumentEvent e) { + // Ignore. } /* diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java index 327d26a1fb..3d44da5dd6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/commons/util/crypt/BlowfishEngine.java @@ -1440,7 +1440,7 @@ public class BlowfishEngine */ private int bytesTo32bits(byte[] src, int srcIndex) { - return ((src[srcIndex + 3] & 0xff) << 24) | ((src[srcIndex + 2] & 0xff) << 16) | ((src[srcIndex + 1] & 0xff) << 8) | ((src[srcIndex] & 0xff)); + return ((src[srcIndex + 3] & 0xff) << 24) | ((src[srcIndex + 2] & 0xff) << 16) | ((src[srcIndex + 1] & 0xff) << 8) | (src[srcIndex] & 0xff); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameTimeController.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameTimeController.java index 73aa8bfa39..1a9571ab27 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameTimeController.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameTimeController.java @@ -169,15 +169,15 @@ public class GameTimeController extends Thread { Thread.sleep(sleepTime); } - catch (InterruptedException e) + catch (Exception e) { + // Ignore. } } if (isNight() != isNight) { isNight = !isNight; - ThreadPool.execute(() -> DayNightSpawnManager.getInstance().notifyChangeMode()); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/LoginServerThread.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/LoginServerThread.java index 1b4e8616b1..a7535b92c2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/LoginServerThread.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/LoginServerThread.java @@ -375,6 +375,7 @@ public class LoginServerThread extends Thread } catch (Exception e) { + // Ignore. } } @@ -382,9 +383,9 @@ public class LoginServerThread extends Thread { Thread.sleep(5000); // 5 seconds tempo. } - catch (InterruptedException e) + catch (Exception e) { - return; // never swallow an interrupt! + // Ignore. } } } @@ -486,6 +487,7 @@ public class LoginServerThread extends Thread } catch (IOException e) { + // Ignore. } } @@ -503,6 +505,7 @@ public class LoginServerThread extends Thread } catch (IOException e) { + // Ignore. } } @@ -521,6 +524,7 @@ public class LoginServerThread extends Thread } catch (IOException e) { + // Ignore. } } @@ -539,6 +543,7 @@ public class LoginServerThread extends Thread } catch (IOException e) { + // Ignore. } } @@ -615,6 +620,7 @@ public class LoginServerThread extends Thread } catch (IOException e) { + // Ignore. } } @@ -678,6 +684,7 @@ public class LoginServerThread extends Thread } catch (IOException e) { + // Ignore. } } @@ -694,6 +701,7 @@ public class LoginServerThread extends Thread } catch (IOException e) { + // Ignore. } } @@ -713,6 +721,7 @@ public class LoginServerThread extends Thread } catch (IOException e) { + // Ignore. } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/MonsterRace.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/MonsterRace.java index 2f68f23227..da1a3f8676 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/MonsterRace.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/MonsterRace.java @@ -31,7 +31,7 @@ public class MonsterRace private final Npc[] _monsters; private int[][] _speeds; private final int[] _first; - + private final int[] _second; protected MonsterRace() @@ -57,7 +57,6 @@ public class MonsterRace if (_monsters[j].getTemplate().getId() == (id + random)) { random = Rnd.get(24); - continue; } } break; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/RecipeController.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/RecipeController.java index b6897cee12..59d26037d9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/RecipeController.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/RecipeController.java @@ -365,8 +365,9 @@ public class RecipeController { Thread.sleep(_delay); } - catch (InterruptedException e) + catch (Exception e) { + // Ignore. } finally { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSigns.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSigns.java index effdbd7606..363a3460e1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSigns.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSigns.java @@ -98,7 +98,7 @@ public class SevenSigns public static final int SEAL_STONE_GREEN_ID = 6361; public static final int SEAL_STONE_RED_ID = 6362; - public static final int[] SEAL_STONE_IDS = + protected static final int[] SEAL_STONE_IDS = { SEAL_STONE_BLUE_ID, SEAL_STONE_GREEN_ID, @@ -230,11 +230,7 @@ public class SevenSigns } // because of previous "date" column usage, check only if it already contains usable data for us - if ((_lastSave.getTimeInMillis() > 7) && _lastSave.before(lastPeriodChange)) - { - return true; - } - return false; + return (_lastSave.getTimeInMillis() > 7) && _lastSave.before(lastPeriodChange); } /** @@ -1728,16 +1724,10 @@ public class SevenSigns return true; } // Golems cannot be summoned by Dusk when the Seal of Strife is controlled by the Dawn - if (isSealValidationPeriod()) + if (isSealValidationPeriod() && (getSealOwner(SEAL_STRIFE) == CABAL_DAWN) && (getPlayerCabal(player.getObjectId()) == CABAL_DUSK)) { - if (getSealOwner(SEAL_STRIFE) == CABAL_DAWN) - { - if (getPlayerCabal(player.getObjectId()) == CABAL_DUSK) - { - player.sendPacket(SystemMessageId.DUE_TO_THE_AFFECTS_OF_THE_SEAL_OF_STRIFE_IT_IS_NOT_POSSIBLE_TO_SUMMON_AT_THIS_TIME); - return true; - } - } + player.sendPacket(SystemMessageId.DUE_TO_THE_AFFECTS_OF_THE_SEAL_OF_STRIFE_IT_IS_NOT_POSSIBLE_TO_SUMMON_AT_THIS_TIME); + return true; } return false; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java index c73277e194..c4221a5266 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/SevenSignsFestival.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; import java.util.HashMap; @@ -969,7 +968,7 @@ public class SevenSignsFestival implements SpawnListener _festivalData.put(festivalCycle, tempData); } } - catch (SQLException e) + catch (Exception e) { LOGGER.log(Level.SEVERE, "SevenSignsFestival: Failed to load configuration: " + e.getMessage(), e); } @@ -1003,7 +1002,7 @@ public class SevenSignsFestival implements SpawnListener } } } - catch (SQLException e) + catch (Exception e) { LOGGER.log(Level.SEVERE, "SevenSignsFestival: Failed to load configuration: " + e.getMessage(), e); } @@ -1033,7 +1032,7 @@ public class SevenSignsFestival implements SpawnListener } psInsert.executeBatch(); } - catch (SQLException e) + catch (Exception e) { LOGGER.log(Level.SEVERE, "SevenSignsFestival: Failed to save configuration: " + e.getMessage(), e); } @@ -1804,8 +1803,9 @@ public class SevenSignsFestival implements SpawnListener { wait(FESTIVAL_SIGNUP_TIME); } - catch (InterruptedException e) + catch (Exception e) { + // Ignore. } // Clear past participants, they can no longer register their score if not done so already. @@ -1838,8 +1838,9 @@ public class SevenSignsFestival implements SpawnListener } } } - catch (InterruptedException e) + catch (Exception e) { + // Ignore. } } else @@ -1878,8 +1879,9 @@ public class SevenSignsFestival implements SpawnListener { wait(Config.ALT_FESTIVAL_FIRST_SPAWN); } - catch (InterruptedException e) + catch (Exception e) { + // Ignore. } elapsedTime = Config.ALT_FESTIVAL_FIRST_SPAWN; @@ -1900,8 +1902,9 @@ public class SevenSignsFestival implements SpawnListener { wait(Config.ALT_FESTIVAL_FIRST_SWARM - Config.ALT_FESTIVAL_FIRST_SPAWN); } - catch (InterruptedException e) + catch (Exception e) { + // Ignore. } elapsedTime += Config.ALT_FESTIVAL_FIRST_SWARM - Config.ALT_FESTIVAL_FIRST_SPAWN; @@ -1916,8 +1919,9 @@ public class SevenSignsFestival implements SpawnListener { wait(Config.ALT_FESTIVAL_SECOND_SPAWN - Config.ALT_FESTIVAL_FIRST_SWARM); } - catch (InterruptedException e) + catch (Exception e) { + // Ignore. } // Spawn an extra set of monsters (archers) on the free platforms with @@ -1944,8 +1948,9 @@ public class SevenSignsFestival implements SpawnListener { wait(Config.ALT_FESTIVAL_SECOND_SWARM - Config.ALT_FESTIVAL_SECOND_SPAWN); } - catch (InterruptedException e) + catch (Exception e) { + // Ignore. } for (DarknessFestival festivalInst : _festivalInstances.values()) @@ -1960,8 +1965,9 @@ public class SevenSignsFestival implements SpawnListener { wait(Config.ALT_FESTIVAL_CHEST_SPAWN - Config.ALT_FESTIVAL_SECOND_SWARM); } - catch (InterruptedException e) + catch (Exception e) { + // Ignore. } // Spawn the festival chests, which enable the team to gain greater rewards @@ -1979,8 +1985,9 @@ public class SevenSignsFestival implements SpawnListener { wait(Config.ALT_FESTIVAL_LENGTH - elapsedTime); } - catch (InterruptedException e) + catch (Exception e) { + // Ignore. } // Participants can no longer opt to increase the challenge, as the festival will soon close. @@ -2218,24 +2225,24 @@ public class SevenSignsFestival implements SpawnListener */ protected void spawnFestivalMonsters(int respawnDelay, int spawnType) { - int[][] _npcSpawns = null; + int[][] npcSpawns = null; switch (spawnType) { case 0: case 1: { - _npcSpawns = (_cabal == SevenSigns.CABAL_DAWN) ? FESTIVAL_DAWN_PRIMARY_SPAWNS[_levelRange] : FESTIVAL_DUSK_PRIMARY_SPAWNS[_levelRange]; + npcSpawns = (_cabal == SevenSigns.CABAL_DAWN) ? FESTIVAL_DAWN_PRIMARY_SPAWNS[_levelRange] : FESTIVAL_DUSK_PRIMARY_SPAWNS[_levelRange]; break; } case 2: { - _npcSpawns = (_cabal == SevenSigns.CABAL_DAWN) ? FESTIVAL_DAWN_SECONDARY_SPAWNS[_levelRange] : FESTIVAL_DUSK_SECONDARY_SPAWNS[_levelRange]; + npcSpawns = (_cabal == SevenSigns.CABAL_DAWN) ? FESTIVAL_DAWN_SECONDARY_SPAWNS[_levelRange] : FESTIVAL_DUSK_SECONDARY_SPAWNS[_levelRange]; break; } case 3: { - _npcSpawns = (_cabal == SevenSigns.CABAL_DAWN) ? FESTIVAL_DAWN_CHEST_SPAWNS[_levelRange] : FESTIVAL_DUSK_CHEST_SPAWNS[_levelRange]; + npcSpawns = (_cabal == SevenSigns.CABAL_DAWN) ? FESTIVAL_DAWN_CHEST_SPAWNS[_levelRange] : FESTIVAL_DUSK_CHEST_SPAWNS[_levelRange]; break; } default: @@ -2244,9 +2251,9 @@ public class SevenSignsFestival implements SpawnListener } } - for (int[] _npcSpawn : _npcSpawns) + for (int[] spawn : npcSpawns) { - final FestivalSpawn currSpawn = new FestivalSpawn(_npcSpawn); + final FestivalSpawn currSpawn = new FestivalSpawn(spawn); // Only spawn archers/marksmen if specified to do so. if ((spawnType == 1) && isFestivalArcher(currSpawn._npcId)) @@ -2337,8 +2344,9 @@ public class SevenSignsFestival implements SpawnListener relocatePlayer(participant, false); participant.sendMessage("The festival has ended. Your party leader must now register your score before the next festival takes place."); } - catch (NullPointerException e) + catch (Exception e) { + // Ignore. } } @@ -2400,8 +2408,9 @@ public class SevenSignsFestival implements SpawnListener participant.teleToLocation(TeleportWhereType.TOWN); participant.sendMessage("You have been removed from the festival arena."); } - catch (NullPointerException e2) + catch (Exception e2) { + // Ignore. } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java index 1915abe5c5..12a03c0b81 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/Shutdown.java @@ -211,6 +211,7 @@ public class Shutdown extends Thread } catch (Throwable t) { + // ignore } // Backup database. @@ -402,7 +403,7 @@ public class Shutdown extends Thread Thread.sleep(delay); } } - catch (InterruptedException e) + catch (Exception e) { // this will never happen } @@ -513,9 +514,9 @@ public class Shutdown extends Thread { Thread.sleep(5000); } - catch (InterruptedException e) + catch (Exception e) { - // never happens :p + // this will never happen } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java index 38c1899ff0..60471146d4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AbstractAI.java @@ -523,7 +523,7 @@ public abstract class AbstractAI implements Ctrl protected abstract void onEvtArrivedRevalidate(); - protected abstract void onEvtArrivedBlocked(Location blocked_at_pos); + protected abstract void onEvtArrivedBlocked(Location location); protected abstract void onEvtForgetObject(WorldObject object); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java index eb0e61369a..a295098406 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/AttackableAI.java @@ -199,14 +199,10 @@ public class AttackableAI extends CreatureAI return false; } - // Check if the target is a Playable - if (target.isPlayable()) + // Check if the target is a Playable and if the AI isn't a Raid Boss, can see Silent Moving players and the target isn't in silent move mode + if (target.isPlayable() && !(me.isRaid()) && !(me.canSeeThroughSilentMove()) && ((Playable) target).isSilentMovingAffected()) { - // Check if the AI isn't a Raid Boss, can See Silent Moving players and the target isn't in silent move mode - if (!(me.isRaid()) && !(me.canSeeThroughSilentMove()) && ((Playable) target).isSilentMovingAffected()) - { - return false; - } + return false; } // Gets the player if there is any. @@ -837,33 +833,30 @@ public class AttackableAI extends CreatureAI } // Check if the WorldObject is inside the Faction Range of the actor - if (called.hasAI()) + if (called.hasAI() && (Math.abs(originalAttackTarget.getZ() - called.getZ()) < 600) && npc.getAttackByList().contains(originalAttackTarget) && ((called.getAI()._intention == AI_INTENTION_IDLE) || (called.getAI()._intention == AI_INTENTION_ACTIVE)) && (called.getInstanceId() == npc.getInstanceId())) { - if ((Math.abs(originalAttackTarget.getZ() - called.getZ()) < 600) && npc.getAttackByList().contains(originalAttackTarget) && ((called.getAI()._intention == AI_INTENTION_IDLE) || (called.getAI()._intention == AI_INTENTION_ACTIVE)) && (called.getInstanceId() == npc.getInstanceId())) + if (originalAttackTarget.isPlayable()) { - if (originalAttackTarget.isPlayable()) + if (originalAttackTarget.isInParty() && originalAttackTarget.getParty().isInDimensionalRift()) { - if (originalAttackTarget.isInParty() && originalAttackTarget.getParty().isInDimensionalRift()) - { - byte riftType = originalAttackTarget.getParty().getDimensionalRift().getType(); - byte riftRoom = originalAttackTarget.getParty().getDimensionalRift().getCurrentRoom(); - - if ((npc instanceof RiftInvaderInstance) && !DimensionalRiftManager.getInstance().getRoom(riftType, riftRoom).checkIfInZone(npc.getX(), npc.getY(), npc.getZ())) - { - continue; - } - } + byte riftType = originalAttackTarget.getParty().getDimensionalRift().getType(); + byte riftRoom = originalAttackTarget.getParty().getDimensionalRift().getCurrentRoom(); - // By default, when a faction member calls for help, attack the caller's attacker. - // Notify the AI with EVT_AGGRESSION - called.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, originalAttackTarget, 1); - EventDispatcher.getInstance().notifyEventAsync(new OnAttackableFactionCall(called, getActiveChar(), originalAttackTarget.getActingPlayer(), originalAttackTarget.isSummon()), called); - } - else if (called.isAttackable() && (getAttackTarget() != null) && (called.getAI()._intention != AI_INTENTION_ATTACK)) - { - ((Attackable) called).addDamageHate(getAttackTarget(), 0, npc.getHating(getAttackTarget())); - called.getAI().setIntention(AI_INTENTION_ATTACK, getAttackTarget()); + if ((npc instanceof RiftInvaderInstance) && !DimensionalRiftManager.getInstance().getRoom(riftType, riftRoom).checkIfInZone(npc.getX(), npc.getY(), npc.getZ())) + { + continue; + } } + + // By default, when a faction member calls for help, attack the caller's attacker. + // Notify the AI with EVT_AGGRESSION + called.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, originalAttackTarget, 1); + EventDispatcher.getInstance().notifyEventAsync(new OnAttackableFactionCall(called, getActiveChar(), originalAttackTarget.getActingPlayer(), originalAttackTarget.isSummon()), called); + } + else if (called.isAttackable() && (getAttackTarget() != null) && (called.getAI()._intention != AI_INTENTION_ATTACK)) + { + ((Attackable) called).addDamageHate(getAttackTarget(), 0, npc.getHating(getAttackTarget())); + called.getAI().setIntention(AI_INTENTION_ATTACK, getAttackTarget()); } } } @@ -915,42 +908,39 @@ public class AttackableAI extends CreatureAI } } // Dodge if its needed - if (!npc.isMovementDisabled() && (npc.getDodge() > 0)) + if (!npc.isMovementDisabled() && (npc.getDodge() > 0) && (Rnd.get(100) <= npc.getDodge())) { - if (Rnd.get(100) <= npc.getDodge()) + // Micht: Keeping this one otherwise we should do 2 sqrt + double distance2 = npc.calculateDistanceSq2D(mostHate); + if (Math.sqrt(distance2) <= (60 + combinedCollision)) { - // Micht: Keeping this one otherwise we should do 2 sqrt - double distance2 = npc.calculateDistanceSq2D(mostHate); - if (Math.sqrt(distance2) <= (60 + combinedCollision)) + int posX = npc.getX(); + int posY = npc.getY(); + int posZ = npc.getZ() + 30; + + if (originalAttackTarget.getX() < posX) { - int posX = npc.getX(); - int posY = npc.getY(); - int posZ = npc.getZ() + 30; - - if (originalAttackTarget.getX() < posX) - { - posX += 300; - } - else - { - posX -= 300; - } - - if (originalAttackTarget.getY() < posY) - { - posY += 300; - } - else - { - posY -= 300; - } - - if (GeoEngine.getInstance().canMoveToTarget(npc.getX(), npc.getY(), npc.getZ(), posX, posY, posZ, npc.getInstanceId())) - { - setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(posX, posY, posZ, 0)); - } - return; + posX += 300; } + else + { + posX -= 300; + } + + if (originalAttackTarget.getY() < posY) + { + posY += 300; + } + else + { + posY -= 300; + } + + if (GeoEngine.getInstance().canMoveToTarget(npc.getX(), npc.getY(), npc.getZ(), posX, posY, posZ, npc.getInstanceId())) + { + setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(posX, posY, posZ, 0)); + } + return; } } @@ -962,26 +952,20 @@ public class AttackableAI extends CreatureAI { if (!((MonsterInstance) npc).hasMinions()) { - if (_chaosTime > Config.RAID_CHAOS_TIME) + if ((_chaosTime > Config.RAID_CHAOS_TIME) && (Rnd.get(100) <= (100 - ((npc.getCurrentHp() * 100) / npc.getMaxHp())))) { - if (Rnd.get(100) <= (100 - ((npc.getCurrentHp() * 100) / npc.getMaxHp()))) - { - aggroReconsider(); - _chaosTime = 0; - return; - } + aggroReconsider(); + _chaosTime = 0; + return; } } else { - if (_chaosTime > Config.RAID_CHAOS_TIME) + if ((_chaosTime > Config.RAID_CHAOS_TIME) && (Rnd.get(100) <= (100 - ((npc.getCurrentHp() * 200) / npc.getMaxHp())))) { - if (Rnd.get(100) <= (100 - ((npc.getCurrentHp() * 200) / npc.getMaxHp()))) - { - aggroReconsider(); - _chaosTime = 0; - return; - } + aggroReconsider(); + _chaosTime = 0; + return; } } } @@ -1000,14 +984,11 @@ public class AttackableAI extends CreatureAI } else { - if (_chaosTime > Config.MINION_CHAOS_TIME) + if ((_chaosTime > Config.MINION_CHAOS_TIME) && (Rnd.get(100) <= (100 - ((npc.getCurrentHp() * 200) / npc.getMaxHp())))) { - if (Rnd.get(100) <= (100 - ((npc.getCurrentHp() * 200) / npc.getMaxHp()))) - { - aggroReconsider(); - _chaosTime = 0; - return; - } + aggroReconsider(); + _chaosTime = 0; + return; } } } @@ -1098,18 +1079,15 @@ public class AttackableAI extends CreatureAI } percentage = (obj.getCurrentHp() / obj.getMaxHp()) * 100; - if (Rnd.get(100) < ((100 - percentage) / 10)) + if ((Rnd.get(100) < ((100 - percentage) / 10)) && GeoEngine.getInstance().canSeeTarget(npc, obj)) { - if (GeoEngine.getInstance().canSeeTarget(npc, obj)) - { - clientStopMoving(null); - final WorldObject target = npc.getTarget(); - npc.setTarget(obj); - npc.doCast(sk); - npc.setTarget(target); - // LOGGER.debug(this + " used heal skill " + sk + " on " + obj); - return; - } + clientStopMoving(null); + final WorldObject target = npc.getTarget(); + npc.setTarget(obj); + npc.doCast(sk); + npc.setTarget(target); + // LOGGER.debug(this + " used heal skill " + sk + " on " + obj); + return; } } } @@ -1178,23 +1156,20 @@ public class AttackableAI extends CreatureAI { continue; } - if (!npc.isInMyClan(obj)) { continue; } - if (Rnd.get(100) < 10) + + if ((Rnd.get(100) < 10) && GeoEngine.getInstance().canSeeTarget(npc, obj)) { - if (GeoEngine.getInstance().canSeeTarget(npc, obj)) - { - clientStopMoving(null); - final WorldObject target = npc.getTarget(); - npc.setTarget(obj); - npc.doCast(sk); - npc.setTarget(target); - // LOGGER.debug(this + " used heal skill " + sk + " on clan member " + obj); - return; - } + clientStopMoving(null); + final WorldObject target = npc.getTarget(); + npc.setTarget(obj); + npc.doCast(sk); + npc.setTarget(target); + // LOGGER.debug(this + " used heal skill " + sk + " on clan member " + obj); + return; } } } @@ -1289,12 +1264,9 @@ public class AttackableAI extends CreatureAI return false; } - if (getAttackTarget() == null) + if ((getAttackTarget() == null) && (caster.getMostHated() != null)) { - if (caster.getMostHated() != null) - { - setAttackTarget(caster.getMostHated()); - } + setAttackTarget(caster.getMostHated()); } final Creature attackTarget = getAttackTarget(); @@ -1474,16 +1446,13 @@ public class AttackableAI extends CreatureAI } percentage = (obj.getCurrentHp() / obj.getMaxHp()) * 100; - if (Rnd.get(100) < ((100 - percentage) / 10)) + if ((Rnd.get(100) < ((100 - percentage) / 10)) && GeoEngine.getInstance().canSeeTarget(caster, obj)) { - if (GeoEngine.getInstance().canSeeTarget(caster, obj)) - { - clientStopMoving(null); - caster.setTarget(obj); - caster.doCast(sk); - caster.setTarget(attackTarget); - return true; - } + clientStopMoving(null); + caster.setTarget(obj); + caster.doCast(sk); + caster.setTarget(attackTarget); + return true; } } } @@ -1491,16 +1460,13 @@ public class AttackableAI extends CreatureAI { for (Attackable obj : World.getInstance().getVisibleObjectsInRange(caster, Attackable.class, sk.getAffectRange() + caster.getTemplate().getCollisionRadius())) { - if (obj.isInMyClan(caster)) + if (obj.isInMyClan(caster) && (obj.getCurrentHp() < obj.getMaxHp()) && (Rnd.get(100) <= 20)) { - if ((obj.getCurrentHp() < obj.getMaxHp()) && (Rnd.get(100) <= 20)) - { - clientStopMoving(null); - caster.setTarget(caster); - caster.doCast(sk); - caster.setTarget(attackTarget); - return true; - } + clientStopMoving(null); + caster.setTarget(caster); + caster.doCast(sk); + caster.setTarget(attackTarget); + return true; } } } @@ -1539,17 +1505,11 @@ public class AttackableAI extends CreatureAI { if (sk.getTargetType() == TargetType.ONE) { - if (!attackTarget.isDead() && (dist2 <= srange)) + if (!attackTarget.isDead() && (dist2 <= srange) && ((dist2 > range) || attackTarget.isMoving()) && !attackTarget.isAffectedBySkill(sk.getId())) { - if ((dist2 > range) || attackTarget.isMoving()) - { - if (!attackTarget.isAffectedBySkill(sk.getId())) - { - clientStopMoving(null); - caster.doCast(sk); - return true; - } - } + clientStopMoving(null); + caster.doCast(sk); + return true; } Creature target = effectTargetReconsider(sk, false); @@ -1662,12 +1622,9 @@ public class AttackableAI extends CreatureAI Creature leader = caster.getLeader(); if (leader != null) { - if (leader.isDead()) + if (leader.isDead() && !Util.checkIfInRange((sk.getCastRange() + caster.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius()), caster, leader, false) && !isParty(sk) && !caster.isMovementDisabled()) { - if (!Util.checkIfInRange((sk.getCastRange() + caster.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius()), caster, leader, false) && !isParty(sk) && !caster.isMovementDisabled()) - { - moveToPawn(leader, sk.getCastRange() + caster.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius()); - } + moveToPawn(leader, sk.getCastRange() + caster.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius()); } if (GeoEngine.getInstance().canSeeTarget(caster, leader)) { @@ -1692,16 +1649,13 @@ public class AttackableAI extends CreatureAI continue; } - if (Rnd.get(100) < 10) + if ((Rnd.get(100) < 10) && GeoEngine.getInstance().canSeeTarget(caster, obj)) { - if (GeoEngine.getInstance().canSeeTarget(caster, obj)) - { - clientStopMoving(null); - caster.setTarget(obj); - caster.doCast(sk); - caster.setTarget(attackTarget); - return true; - } + clientStopMoving(null); + caster.setTarget(obj); + caster.doCast(sk); + caster.setTarget(attackTarget); + return true; } } } @@ -1709,16 +1663,13 @@ public class AttackableAI extends CreatureAI { for (Npc obj : World.getInstance().getVisibleObjectsInRange(caster, Npc.class, sk.getAffectRange() + caster.getTemplate().getCollisionRadius())) { - if (caster.isInMyClan(obj)) + if (caster.isInMyClan(obj) && (obj.getCurrentHp() < obj.getMaxHp()) && (Rnd.get(100) <= 20)) { - if ((obj.getCurrentHp() < obj.getMaxHp()) && (Rnd.get(100) <= 20)) - { - clientStopMoving(null); - caster.setTarget(caster); - caster.doCast(sk); - caster.setTarget(attackTarget); - return true; - } + clientStopMoving(null); + caster.setTarget(caster); + caster.doCast(sk); + caster.setTarget(attackTarget); + return true; } } } @@ -1768,46 +1719,32 @@ public class AttackableAI extends CreatureAI final double dist = npc.calculateDistance2D(target); final int range = npc.getPhysicalAttackRange() + npc.getTemplate().getCollisionRadius() + target.getTemplate().getCollisionRadius(); + // TODO(Zoey76): Review this "magic changes". final int random = Rnd.get(100); - if (!target.isImmobilized() && (random < 15)) + if (!target.isImmobilized() && (random < 15) && tryCast(npc, target, AISkillScope.IMMOBILIZE, dist)) { - if (tryCast(npc, target, AISkillScope.IMMOBILIZE, dist)) - { - return; - } + return; } - if (random < 20) + if ((random < 20) && tryCast(npc, target, AISkillScope.COT, dist)) { - if (tryCast(npc, target, AISkillScope.COT, dist)) - { - return; - } + return; } - if (random < 30) + if ((random < 30) && tryCast(npc, target, AISkillScope.DEBUFF, dist)) { - if (tryCast(npc, target, AISkillScope.DEBUFF, dist)) - { - return; - } + return; } - if (random < 40) + if ((random < 40) && tryCast(npc, target, AISkillScope.NEGATIVE, dist)) { - if (tryCast(npc, target, AISkillScope.NEGATIVE, dist)) - { - return; - } + return; } - if (npc.isMovementDisabled() || (npc.getAiType() == AIType.MAGE) || (npc.getAiType() == AIType.HEALER)) + if ((npc.isMovementDisabled() || (npc.getAiType() == AIType.MAGE) || (npc.getAiType() == AIType.HEALER)) && tryCast(npc, target, AISkillScope.ATTACK, dist)) { - if (tryCast(npc, target, AISkillScope.ATTACK, dist)) - { - return; - } + return; } if (tryCast(npc, target, AISkillScope.UNIVERSAL, dist)) @@ -2107,12 +2044,12 @@ public class AttackableAI extends CreatureAI double dist2 = 0; int range = 0; final Attackable actor = getActiveChar(); - final Creature MostHate = actor.getMostHated(); + final Creature mostHate = actor.getMostHated(); if (actor.getHateList() != null) { for (Creature obj : actor.getHateList()) { - if ((obj == null) || !GeoEngine.getInstance().canSeeTarget(actor, obj) || obj.isDead() || (obj != MostHate) || (obj == actor)) + if ((obj == null) || !GeoEngine.getInstance().canSeeTarget(actor, obj) || obj.isDead() || (obj != mostHate) || (obj == actor)) { continue; } @@ -2133,7 +2070,7 @@ public class AttackableAI extends CreatureAI if (dist2 <= range) { - actor.addDamageHate(obj, 0, MostHate != null ? actor.getHating(MostHate) : 2000); + actor.addDamageHate(obj, 0, mostHate != null ? actor.getHating(mostHate) : 2000); actor.setTarget(obj); setAttackTarget(obj); return; @@ -2144,13 +2081,13 @@ public class AttackableAI extends CreatureAI { World.getInstance().forEachVisibleObject(actor, Creature.class, obj -> { - if ((obj == null) || !GeoEngine.getInstance().canSeeTarget(actor, obj) || obj.isDead() || (obj != MostHate) || (obj == actor) || (obj == getAttackTarget())) + if ((obj == null) || !GeoEngine.getInstance().canSeeTarget(actor, obj) || obj.isDead() || (obj != mostHate) || (obj == actor) || (obj == getAttackTarget())) { return; } if (obj.isPlayer()) { - actor.addDamageHate(obj, 0, MostHate != null ? actor.getHating(MostHate) : 2000); + actor.addDamageHate(obj, 0, mostHate != null ? actor.getHating(mostHate) : 2000); actor.setTarget(obj); setAttackTarget(obj); } @@ -2162,14 +2099,14 @@ public class AttackableAI extends CreatureAI { return; } - actor.addDamageHate(obj, 0, MostHate != null ? actor.getHating(MostHate) : 2000); + actor.addDamageHate(obj, 0, mostHate != null ? actor.getHating(mostHate) : 2000); actor.setTarget(obj); setAttackTarget(obj); } } else if (obj.isSummon()) { - actor.addDamageHate(obj, 0, MostHate != null ? actor.getHating(MostHate) : 2000); + actor.addDamageHate(obj, 0, mostHate != null ? actor.getHating(mostHate) : 2000); actor.setTarget(obj); setAttackTarget(obj); } @@ -2180,7 +2117,7 @@ public class AttackableAI extends CreatureAI private void aggroReconsider() { final Attackable actor = getActiveChar(); - final Creature MostHate = actor.getMostHated(); + final Creature mostHate = actor.getMostHated(); if (actor.getHateList() != null) { final int rand = Rnd.get(actor.getHateList().size()); @@ -2206,7 +2143,7 @@ public class AttackableAI extends CreatureAI { continue; } - actor.addDamageHate(obj, 0, MostHate != null ? actor.getHating(MostHate) : 2000); + actor.addDamageHate(obj, 0, mostHate != null ? actor.getHating(mostHate) : 2000); actor.setTarget(obj); setAttackTarget(obj); return; @@ -2217,13 +2154,13 @@ public class AttackableAI extends CreatureAI { World.getInstance().forEachVisibleObject(actor, Creature.class, obj -> { - if (!GeoEngine.getInstance().canSeeTarget(actor, obj) || obj.isDead() || (obj != MostHate) || (obj == actor)) + if (!GeoEngine.getInstance().canSeeTarget(actor, obj) || obj.isDead() || (obj != mostHate) || (obj == actor)) { return; } if (obj.isPlayer()) { - actor.addDamageHate(obj, 0, (MostHate != null) && !MostHate.isDead() ? actor.getHating(MostHate) : 2000); + actor.addDamageHate(obj, 0, (mostHate != null) && !mostHate.isDead() ? actor.getHating(mostHate) : 2000); actor.setTarget(obj); setAttackTarget(obj); } @@ -2235,14 +2172,14 @@ public class AttackableAI extends CreatureAI { return; } - actor.addDamageHate(obj, 0, MostHate != null ? actor.getHating(MostHate) : 2000); + actor.addDamageHate(obj, 0, mostHate != null ? actor.getHating(mostHate) : 2000); actor.setTarget(obj); setAttackTarget(obj); } } else if (obj.isSummon()) { - actor.addDamageHate(obj, 0, MostHate != null ? actor.getHating(MostHate) : 2000); + actor.addDamageHate(obj, 0, mostHate != null ? actor.getHating(mostHate) : 2000); actor.setTarget(obj); setAttackTarget(obj); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/ControllableMobAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/ControllableMobAI.java index 09aa6eee4d..e2a1ada1dd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/ControllableMobAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/ControllableMobAI.java @@ -154,7 +154,7 @@ public class ControllableMobAI extends AttackableAI return; } - int max_range = 0; + int maxRange = 0; // check distant skills for (Skill sk : _actor.getAllSkills()) @@ -165,12 +165,12 @@ public class ControllableMobAI extends AttackableAI return; } - max_range = Math.max(max_range, sk.getCastRange()); + maxRange = Math.max(maxRange, sk.getCastRange()); } if (!_isNotMoving) { - moveToPawn(getAttackTarget(), max_range); + moveToPawn(getAttackTarget(), maxRange); } } @@ -197,7 +197,7 @@ public class ControllableMobAI extends AttackableAI final double dist2 = _actor.calculateDistanceSq2D(target); final int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + target.getTemplate().getCollisionRadius(); - int max_range = range; + int maxRange = range; if (!_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) { @@ -212,7 +212,7 @@ public class ControllableMobAI extends AttackableAI return; } - max_range = Math.max(max_range, castRange); + maxRange = Math.max(maxRange, castRange); } if (!_isNotMoving) @@ -237,7 +237,7 @@ public class ControllableMobAI extends AttackableAI _actor.setTarget(getForcedTarget()); final double dist2 = _actor.calculateDistanceSq2D(getForcedTarget()); final int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + getForcedTarget().getTemplate().getCollisionRadius(); - int max_range = range; + int maxRange = range; if (!_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) { @@ -252,7 +252,7 @@ public class ControllableMobAI extends AttackableAI return; } - max_range = Math.max(max_range, castRange); + maxRange = Math.max(maxRange, castRange); } if (!_isNotMoving) @@ -299,7 +299,7 @@ public class ControllableMobAI extends AttackableAI _actor.setTarget(getAttackTarget()); final double dist2 = _actor.calculateDistanceSq2D(getAttackTarget()); final int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + getAttackTarget().getTemplate().getCollisionRadius(); - int max_range = range; + int maxRange = range; if (!_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) { @@ -314,7 +314,7 @@ public class ControllableMobAI extends AttackableAI return; } - max_range = Math.max(max_range, castRange); + maxRange = Math.max(maxRange, castRange); } moveToPawn(getAttackTarget(), range); @@ -432,9 +432,9 @@ public class ControllableMobAI extends AttackableAI return _alternateAI; } - public void setAlternateAI(int _alternateai) + public void setAlternateAI(int alternateAi) { - _alternateAI = _alternateai; + _alternateAI = alternateAi; } public void forceAttack(Creature target) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java index 4ca2d7c029..e017429362 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/CreatureAI.java @@ -715,7 +715,7 @@ public class CreatureAI extends AbstractAI * */ @Override - protected void onEvtArrivedBlocked(Location blocked_at_loc) + protected void onEvtArrivedBlocked(Location location) { // If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE if ((getIntention() == AI_INTENTION_MOVE_TO) || (getIntention() == AI_INTENTION_CAST)) @@ -724,7 +724,7 @@ public class CreatureAI extends AbstractAI } // Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast) - clientStopMoving(blocked_at_loc); + clientStopMoving(location); // Launch actions corresponding to the Event Think onEvtThink(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java index 52c94adb91..0866aaa2c2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java @@ -378,11 +378,11 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable { break; } - final WorldObject OldTarget = _actor.getTarget(); + final WorldObject oldTarget = _actor.getTarget(); _actor.setTarget(creature); clientStopMoving(null); _actor.doCast(sk); - _actor.setTarget(OldTarget); + _actor.setTarget(oldTarget); return; } } @@ -422,11 +422,11 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable { break; } - final WorldObject OldTarget = _actor.getTarget(); + final WorldObject oldTarget = _actor.getTarget(); _actor.setTarget(npc); clientStopMoving(null); _actor.doCast(sk); - _actor.setTarget(OldTarget); + _actor.setTarget(oldTarget); return; } } @@ -438,7 +438,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable { // Get all information needed to choose between physical or magical attack Collection
| " + t.getName() + " | " + dateFormat.format(new Date(t.getDate())) + " |
| " + t.getName() + " | " + dateFormat.format(new Date(t.getDate())) + " |
- * TODO: Remove. * @return the effect type */ public EffectType getEffectType() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/AbstractResidence.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/AbstractResidence.java index bf9d5f8501..2882861a0c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/AbstractResidence.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/AbstractResidence.java @@ -90,7 +90,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN public void giveResidentialSkills(PlayerInstance player) { - if ((_residentialSkills != null) && !_residentialSkills.isEmpty()) + if (!_residentialSkills.isEmpty()) { for (SkillHolder sh : _residentialSkills) { @@ -101,7 +101,7 @@ public abstract class AbstractResidence extends ListenersContainer implements IN public void removeResidentialSkills(PlayerInstance player) { - if ((_residentialSkills != null) && !_residentialSkills.isEmpty()) + if (!_residentialSkills.isEmpty()) { for (SkillHolder sh : _residentialSkills) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Auction.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Auction.java index b209e7c2d3..0f40aa6caa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Auction.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/Auction.java @@ -69,7 +69,7 @@ public class Auction public static class Bidder { - private final String _name; // TODO replace with objid + private final String _name; // TODO replace with objId private final String _clanName; private long _bid; private final Calendar _timeBid; @@ -117,10 +117,6 @@ public class Auction /** Task Sheduler for endAuction */ public class AutoEndTask implements Runnable { - public AutoEndTask() - { - } - @Override public void run() { @@ -146,16 +142,16 @@ public class Auction startAutoTask(); } - public Auction(int itemId, Clan Clan, long delay, long bid, String name) + public Auction(int itemId, Clan clan, long delay, long bid, String name) { _id = itemId; _endDate = System.currentTimeMillis() + delay; _itemId = itemId; _itemName = name; _itemType = "ClanHall"; - _sellerId = Clan.getLeaderId(); - _sellerName = Clan.getLeaderName(); - _sellerClanName = Clan.getName(); + _sellerId = clan.getLeaderId(); + _sellerName = clan.getLeaderName(); + _sellerClanName = clan.getName(); _startingBid = bid; } @@ -461,11 +457,11 @@ public class Auction returnItem(_sellerClanName, ClanHallManager.getInstance().getAuctionableHallById(_itemId).getLease(), false); } deleteAuctionFromDB(); - final Clan Clan = ClanTable.getInstance().getClanByName(_bidders.get(_highestBidderId).getClanName()); + final Clan clan = ClanTable.getInstance().getClanByName(_bidders.get(_highestBidderId).getClanName()); _bidders.remove(_highestBidderId); - Clan.setAuctionBiddedAt(0, true); + clan.setAuctionBiddedAt(0, true); removeBids(); - ClanHallManager.getInstance().setOwner(_itemId, Clan); + ClanHallManager.getInstance().setOwner(_itemId, clan); } else { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java index d5179f1fe1..a56d5d2da4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/entity/BlockCheckerEngine.java @@ -113,7 +113,7 @@ public class BlockCheckerEngine } }; // Common z coordinate - private static final int _zCoord = -2405; + private static final int Z_COORD = -2405; // List of dropped items in event (for later deletion) protected Collection