From 074f216ffc763ece731dc7c63846cd0152c17856 Mon Sep 17 00:00:00 2001 From: Rogiel Date: Sun, 7 Aug 2011 22:31:55 -0300 Subject: [PATCH] Code formatting --- .../ai/com/l2jserver/game/ai/NPCAI.java | 2 +- .../db/dao/jdbc/JDBCCharacterDAO.java | 3 +- .../db/dao/jdbc/JDBCChatMessageDAO.java | 2 +- .../l2jserver/db/dao/jdbc/JDBCClanDAO.java | 8 +- .../l2jserver/db/dao/jdbc/JDBCItemDAO.java | 4 +- .../com/l2jserver/db/dao/jdbc/JDBCNPCDAO.java | 4 +- .../db/dao/jdbc/h2/H2CharacterDAO.java | 3 +- .../l2jserver/db/dao/jdbc/h2/H2ClanDAO.java | 4 +- .../net/handler/Lineage2PacketHandler.java | 3 +- .../game/net/packet/client/CM_ATTACK.java | 3 +- .../game/net/packet/client/CM_AUTH_LOGIN.java | 4 +- .../game/net/packet/client/CM_BYPASS.java | 5 +- .../net/packet/client/CM_CHAR_ACTION.java | 3 +- .../net/packet/client/CM_CHAR_OPEN_MAP.java | 2 +- .../game/net/packet/client/CM_CHAT.java | 2 +- .../net/packet/client/CM_ENTER_WORLD.java | 2 +- .../packet/client/CM_EXT_REQ_MANOR_LIST.java | 4 +- .../game/net/packet/client/CM_GOTO_LOBBY.java | 4 +- .../game/net/packet/client/CM_LOGOUT.java | 3 +- .../game/net/packet/server/SM_CHAT.java | 6 +- .../game/net/packet/server/SM_NPC_INFO.java | 10 +- .../l2jserver/model/game/CharacterFriend.java | 2 +- .../object/allocator/BitSetIDAllocator.java | 2 +- .../id/object/provider/ItemIDProvider.java | 2 +- .../id/template/CharacterTemplateID.java | 3 +- .../attack/PhysicalAttackCalculator.java | 498 +++++++++--------- .../model/template/AugmentTemplate.java | 1 - .../model/template/capability/Dropable.java | 2 +- .../template/capability/Enchantable.java | 2 +- .../model/template/capability/Sellable.java | 2 +- .../template/character/CharacterRace.java | 3 +- .../l2jserver/model/world/L2Character.java | 2 +- .../java/com/l2jserver/model/world/Pet.java | 4 +- .../character/CharacterShortcutContainer.java | 5 +- .../model/world/character/CharacterStats.java | 3 +- .../event/CharacterTargetSelectedEvent.java | 3 +- .../l2jserver/model/world/npc/NPCStats.java | 3 +- .../npc/controller/BaseNPCController.java | 4 +- .../com/l2jserver/service/ServiceManager.java | 6 +- .../service/cache/EhCacheService.java | 5 +- .../ProxyConfigurationService.java | 2 +- .../service/database/DatabaseService.java | 4 +- .../database/JDBCDatabaseConfiguration.java | 4 +- .../l2jserver/service/game/PvPService.java | 2 +- .../game/admin/AdministratorService.java | 4 +- .../service/game/ai/AIServiceImpl.java | 6 +- .../CannotSetTargetServiceException.java | 3 +- .../CharacterInJailServiceException.java | 3 +- .../game/character/CharacterServiceImpl.java | 3 +- .../ChatBanActiveChatServiceException.java | 7 +- .../service/game/chat/SimpleChatService.java | 19 +- .../service/game/map/MapService.java | 2 +- .../service/game/npc/NPCServiceImpl.java | 6 +- .../impl/javacc/ClassFileManager.java | 5 +- .../spawn/AlreadySpawnedServiceException.java | 1 - .../spawn/NotSpawnedServiceException.java | 1 - .../service/game/spawn/SpawnServiceImpl.java | 34 +- .../game/template/TemplateService.java | 9 +- .../service/network/NetworkService.java | 3 +- .../broadcast/BroadcastServiceImpl.java | 4 +- .../util/calculator/ComplexCalculator.java | 6 +- .../l2jserver/util/calculator/Function.java | 2 +- .../util/html/markup/HtmlTemplate.java | 2 +- .../db/dao/mysql5/MySQL5CharacterDAOTest.java | 4 +- .../service/cache/SimpleCacheServiceTest.java | 2 +- 65 files changed, 378 insertions(+), 393 deletions(-) diff --git a/data/script/ai/com/l2jserver/game/ai/NPCAI.java b/data/script/ai/com/l2jserver/game/ai/NPCAI.java index 6b68a3f1d..37096e466 100644 --- a/data/script/ai/com/l2jserver/game/ai/NPCAI.java +++ b/data/script/ai/com/l2jserver/game/ai/NPCAI.java @@ -41,7 +41,7 @@ public class NPCAI extends AI { @Override protected void handleDesire(Desire desire) { if (desire instanceof MoveDesire) { - + } } } diff --git a/src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterDAO.java b/src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterDAO.java index 217a9f293..66f0a35bd 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterDAO.java +++ b/src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterDAO.java @@ -147,7 +147,8 @@ public abstract class JDBCCharacterDAO extends character.setAccountID(accountIdFactory.resolveID(rs .getString(ACCOUNT_ID))); if (rs.getString(CLAN_ID) != null) - character.setClanID(clanIdFactory.resolveID(rs.getInt(CLAN_ID))); + character + .setClanID(clanIdFactory.resolveID(rs.getInt(CLAN_ID))); character.setName(rs.getString(NAME)); diff --git a/src/dao/com/l2jserver/db/dao/jdbc/JDBCChatMessageDAO.java b/src/dao/com/l2jserver/db/dao/jdbc/JDBCChatMessageDAO.java index c930ae547..be38e5cb8 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/JDBCChatMessageDAO.java +++ b/src/dao/com/l2jserver/db/dao/jdbc/JDBCChatMessageDAO.java @@ -85,7 +85,7 @@ public abstract class JDBCChatMessageDAO extends return idFactory.resolveID(rs.getInt(MESSAGE_ID)); } }; - + /** * The {@link Mapper} for {@link ChatMessageID} as a PRIMARY KEY */ diff --git a/src/dao/com/l2jserver/db/dao/jdbc/JDBCClanDAO.java b/src/dao/com/l2jserver/db/dao/jdbc/JDBCClanDAO.java index e89772630..774476874 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/JDBCClanDAO.java +++ b/src/dao/com/l2jserver/db/dao/jdbc/JDBCClanDAO.java @@ -41,8 +41,8 @@ import com.l2jserver.service.database.JDBCDatabaseService.SelectSingleQuery; * * @author Rogiel */ -public abstract class JDBCClanDAO extends AbstractJDBCDAO implements - ClanDAO { +public abstract class JDBCClanDAO extends AbstractJDBCDAO + implements ClanDAO { /** * The {@link ClanID} factory */ @@ -62,8 +62,8 @@ public abstract class JDBCClanDAO extends AbstractJDBCDAO implemen public static final String CHAR_ID_LEADER = "character_id_leader"; @Inject - public JDBCClanDAO(DatabaseService database, - ClanIDProvider clanIdFactory, final CharacterIDProvider idFactory) { + public JDBCClanDAO(DatabaseService database, ClanIDProvider clanIdFactory, + final CharacterIDProvider idFactory) { super(database); this.idFactory = clanIdFactory; this.charIdFactory = idFactory; diff --git a/src/dao/com/l2jserver/db/dao/jdbc/JDBCItemDAO.java b/src/dao/com/l2jserver/db/dao/jdbc/JDBCItemDAO.java index a545d77f8..90b482150 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/JDBCItemDAO.java +++ b/src/dao/com/l2jserver/db/dao/jdbc/JDBCItemDAO.java @@ -48,8 +48,8 @@ import com.l2jserver.util.geometry.Coordinate; * * @author Rogiel */ -public abstract class JDBCItemDAO extends AbstractJDBCDAO implements - ItemDAO { +public abstract class JDBCItemDAO extends AbstractJDBCDAO + implements ItemDAO { /** * The {@link ItemID} factory */ diff --git a/src/dao/com/l2jserver/db/dao/jdbc/JDBCNPCDAO.java b/src/dao/com/l2jserver/db/dao/jdbc/JDBCNPCDAO.java index 2dc21e35f..eb135b914 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/JDBCNPCDAO.java +++ b/src/dao/com/l2jserver/db/dao/jdbc/JDBCNPCDAO.java @@ -232,7 +232,7 @@ public abstract class JDBCNPCDAO extends AbstractJDBCDAO implements st.setInt(i++, npc.getPoint().getY()); st.setInt(i++, npc.getPoint().getZ()); st.setDouble(i++, npc.getPoint().getAngle()); - + st.setLong(i++, npc.getRespawnInterval()); } }) > 0; @@ -265,7 +265,7 @@ public abstract class JDBCNPCDAO extends AbstractJDBCDAO implements st.setInt(i++, npc.getPoint().getY()); st.setInt(i++, npc.getPoint().getZ()); st.setDouble(i++, npc.getPoint().getAngle()); - + st.setLong(i++, npc.getRespawnInterval()); // WHERE diff --git a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterDAO.java b/src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterDAO.java index 211fdfa69..a436774c5 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterDAO.java +++ b/src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterDAO.java @@ -30,8 +30,7 @@ import com.l2jserver.service.database.DatabaseService; * * @author Rogiel */ -public class H2CharacterDAO extends JDBCCharacterDAO implements - CharacterDAO { +public class H2CharacterDAO extends JDBCCharacterDAO implements CharacterDAO { @Inject public H2CharacterDAO(DatabaseService database, CharacterIDProvider idFactory, diff --git a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2ClanDAO.java b/src/dao/com/l2jserver/db/dao/jdbc/h2/H2ClanDAO.java index 9bc480902..6761c8639 100644 --- a/src/dao/com/l2jserver/db/dao/jdbc/h2/H2ClanDAO.java +++ b/src/dao/com/l2jserver/db/dao/jdbc/h2/H2ClanDAO.java @@ -31,8 +31,8 @@ import com.l2jserver.service.database.DatabaseService; */ public class H2ClanDAO extends JDBCClanDAO implements ClanDAO { @Inject - public H2ClanDAO(DatabaseService database, - ClanIDProvider clanIdFactory, CharacterIDProvider idFactory) { + public H2ClanDAO(DatabaseService database, ClanIDProvider clanIdFactory, + CharacterIDProvider idFactory) { super(database, clanIdFactory, idFactory); } } diff --git a/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java b/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java index 171f9b2cf..781a7812c 100644 --- a/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java +++ b/src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java @@ -35,8 +35,7 @@ import com.l2jserver.util.html.markup.MarkupTag; /** * This handler dispatches the {@link ClientPacket#process(Lineage2Client)} - * method and creates a new {@link Lineage2Client} once a new channel is - * open. + * method and creates a new {@link Lineage2Client} once a new channel is open. * * @author Rogiel */ diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_ATTACK.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_ATTACK.java index b9d81a11a..a1ba985c2 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_ATTACK.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_ATTACK.java @@ -101,8 +101,7 @@ public class CM_ATTACK extends AbstractClientPacket { } @Inject - public CM_ATTACK(CharacterService charService, - ObjectIDResolver idResolver) { + public CM_ATTACK(CharacterService charService, ObjectIDResolver idResolver) { this.charService = charService; this.idResolver = idResolver; } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java index 45977094c..21e50ef4a 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java @@ -86,8 +86,8 @@ public class CM_AUTH_LOGIN extends AbstractClientPacket { loginKey1, loginKey2)); final List chars = characterDao.selectByAccount(accountId); - conn.write(SM_CHAR_LIST.fromL2Session( - conn.getSession(), chars.toArray(new L2Character[chars.size()]))); + conn.write(SM_CHAR_LIST.fromL2Session(conn.getSession(), + chars.toArray(new L2Character[chars.size()]))); } /** diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java index b1a974a92..a3fec8e3d 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java @@ -41,7 +41,7 @@ import com.l2jserver.util.BufferUtils; */ public class CM_BYPASS extends AbstractClientPacket { private final Logger log = LoggerFactory.getLogger(this.getClass()); - + /** * The packet OPCODE */ @@ -62,8 +62,7 @@ public class CM_BYPASS extends AbstractClientPacket { private String command; @Inject - public CM_BYPASS(ObjectIDResolver idResolver, - NPCService npcService) { + public CM_BYPASS(ObjectIDResolver idResolver, NPCService npcService) { this.idResolver = idResolver; this.npcService = npcService; } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java index 8f4103eb7..166001e4c 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java @@ -71,8 +71,7 @@ public class CM_CHAR_ACTION extends AbstractClientPacket { } @Inject - public CM_CHAR_ACTION(ObjectIDResolver idResolver, - NPCService npcService) { + public CM_CHAR_ACTION(ObjectIDResolver idResolver, NPCService npcService) { this.idResolver = idResolver; this.npcService = npcService; } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java index 073b6f72d..b2e3d4dcd 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_OPEN_MAP.java @@ -32,7 +32,7 @@ public class CM_CHAR_OPEN_MAP extends AbstractClientPacket { * The packet OPCODE */ public static final int OPCODE = 0x6c; - + @Override public void read(Lineage2Client conn, ChannelBuffer buffer) { } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAT.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAT.java index 62fb04bee..533cb07d9 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAT.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_CHAT.java @@ -64,7 +64,7 @@ public class CM_CHAT extends AbstractClientPacket { this.message = BufferUtils.readString(buffer); this.destination = ChatMessageType.fromID(buffer.readInt()); if (this.destination == ChatMessageType.TELL) { // private - // message + // message this.target = BufferUtils.readString(buffer); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java index 86ad09730..aad33dca1 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java @@ -83,7 +83,7 @@ public class CM_ENTER_WORLD extends AbstractClientPacket { } catch (SpawnPointNotFoundServiceException e) { conn.sendActionFailed(); } catch (AlreadySpawnedServiceException e) { - //TODO send an error message here + // TODO send an error message here } } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java index 2cd9c792a..1bb6e2cd4 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java @@ -43,7 +43,7 @@ public class CM_EXT_REQ_MANOR_LIST extends AbstractClientPacket { @Override public void process(final Lineage2Client conn) { - conn.write(new SM_MANOR_LIST("gludio", "dion", "giran", "oren", - "aden", "innadril", "goddard", "rune", "schuttgart")); + conn.write(new SM_MANOR_LIST("gludio", "dion", "giran", "oren", "aden", + "innadril", "goddard", "rune", "schuttgart")); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java index 85b21819d..1869065cf 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java @@ -61,7 +61,7 @@ public class CM_GOTO_LOBBY extends AbstractClientPacket { public void process(final Lineage2Client conn) { final List chars = characterDao.selectByAccount(conn .getSession().getAccountID()); - conn.write(SM_CHAR_LIST.fromL2Session( - conn.getSession(), chars.toArray(new L2Character[0]))); + conn.write(SM_CHAR_LIST.fromL2Session(conn.getSession(), + chars.toArray(new L2Character[0]))); } } diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java index 9456b7ed7..310109a8f 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java @@ -38,8 +38,7 @@ public class CM_LOGOUT extends AbstractClientPacket { /** * The logger */ - private static final Logger log = LoggerFactory - .getLogger(CM_LOGOUT.class); + private static final Logger log = LoggerFactory.getLogger(CM_LOGOUT.class); @Override public void read(Lineage2Client conn, ChannelBuffer buffer) { diff --git a/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAT.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAT.java index 60c4a118d..05187746c 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAT.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_CHAT.java @@ -54,16 +54,14 @@ public class SM_CHAT extends AbstractServerPacket { */ private int messageID = 0; - public SM_CHAT(Actor character, ChatMessageType destination, - String message) { + public SM_CHAT(Actor character, ChatMessageType destination, String message) { super(OPCODE); this.actor = character; this.destination = destination; this.message = message; } - public SM_CHAT(Actor actor, ChatMessageType destination, - int messageID) { + public SM_CHAT(Actor actor, ChatMessageType destination, int messageID) { super(OPCODE); this.actor = actor; this.destination = destination; diff --git a/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java b/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java index aafb13fe8..93b8ddb53 100644 --- a/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java +++ b/src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java @@ -48,11 +48,11 @@ public class SM_NPC_INFO extends AbstractServerPacket { buffer.writeInt(npc.getID().getID()); buffer.writeInt(template.getID().getID() + 1000000); // npctype id - //if (npc instanceof NPC) { - buffer.writeInt((template.isAttackable() ? 0x01 : 0x00)); - //} else { - // buffer.writeInt(0x01); - //} + // if (npc instanceof NPC) { + buffer.writeInt((template.isAttackable() ? 0x01 : 0x00)); + // } else { + // buffer.writeInt(0x01); + // } buffer.writeInt(npc.getPoint().getX()); buffer.writeInt(npc.getPoint().getY()); buffer.writeInt(npc.getPoint().getZ()); diff --git a/src/main/java/com/l2jserver/model/game/CharacterFriend.java b/src/main/java/com/l2jserver/model/game/CharacterFriend.java index 613d9e813..40a606a1c 100644 --- a/src/main/java/com/l2jserver/model/game/CharacterFriend.java +++ b/src/main/java/com/l2jserver/model/game/CharacterFriend.java @@ -30,7 +30,7 @@ public class CharacterFriend extends AbstractModel { public CharacterFriend(FriendID id) { this.setID(id); } - + public CharacterID getCharacterID() { return id.getID1(); } diff --git a/src/main/java/com/l2jserver/model/id/object/allocator/BitSetIDAllocator.java b/src/main/java/com/l2jserver/model/id/object/allocator/BitSetIDAllocator.java index 886675753..4c50e0dad 100644 --- a/src/main/java/com/l2jserver/model/id/object/allocator/BitSetIDAllocator.java +++ b/src/main/java/com/l2jserver/model/id/object/allocator/BitSetIDAllocator.java @@ -134,7 +134,7 @@ public class BitSetIDAllocator implements IDAllocator { lock.unlock(); } } - + @Override public void clear() { ids.clear(); diff --git a/src/main/java/com/l2jserver/model/id/object/provider/ItemIDProvider.java b/src/main/java/com/l2jserver/model/id/object/provider/ItemIDProvider.java index 6334c5187..416445d11 100644 --- a/src/main/java/com/l2jserver/model/id/object/provider/ItemIDProvider.java +++ b/src/main/java/com/l2jserver/model/id/object/provider/ItemIDProvider.java @@ -67,7 +67,7 @@ public class ItemIDProvider implements ObjectIDProvider { } return idObject; } - + @Override public void destroy(ItemID id) { idService.remove(id); diff --git a/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java b/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java index 2b09db1ce..a0ce40f62 100644 --- a/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java +++ b/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java @@ -30,8 +30,7 @@ import com.l2jserver.service.game.template.TemplateService; */ public class CharacterTemplateID extends ActorTemplateID { @Inject - public CharacterTemplateID(@Assisted int id, - TemplateService templateService) { + public CharacterTemplateID(@Assisted int id, TemplateService templateService) { super(id, templateService); } } diff --git a/src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java b/src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java index 2ad1ccaa2..f6a6d0149 100644 --- a/src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java +++ b/src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java @@ -28,254 +28,256 @@ public class PhysicalAttackCalculator extends AttackCalculator { super(new AttackCalculatorFunction(0x000, AttackCalculatorType.DAMAGE) { @Override public double calculate(Actor attacker, Actor target, double value) { -// // final boolean isPvP = (attacker instanceof L2Playable) && -// // (target instanceof L2Playable); -// // TODO soulshot charge -// boolean soulshot = false; -// -// double damage = attacker.getStats().getPhysicalAttack(); -// double defense = target.getStats().getPhysicalDefense(); -// // damage += calcValakasAttribute(attacker, target, skill); -// // if (attacker instanceof NPC) { -// // if (((NPC) attacker)._soulshotcharged) { -// // ss = true; -// // } else -// // ss = false; -// // ((L2Npc) attacker)._soulshotcharged = false; -// // } -// // TODO implement pvp -// // Def bonusses in PvP fight -// // if (isPvP) { -// // if (skill == null) -// // defence *= target.calcStat(Stats.PVP_PHYSICAL_DEF, 1, -// // null, null); -// // else -// // defence *= target.calcStat(Stats.PVP_PHYS_SKILL_DEF, 1, -// // null, null); -// // } -// -// // TODO implement shield -// // switch (shld) { -// // case SHIELD_DEFENSE_SUCCEED: -// // if (!Config.ALT_GAME_SHIELD_BLOCKS) -// // defense += target.getShldDef(); -// // break; -// // case SHIELD_DEFENSE_PERFECT_BLOCK: // perfect block -// // return 1.; -// // } -// -// if (soulshot) -// damage *= 2; -// // if (skill != null) { -// // double skillpower = skill.getPower(attacker, target, isPvP); -// // float ssboost = skill.getSSBoost(); -// // if (ssboost <= 0) -// // damage += skillpower; -// // else if (ssboost > 0) { -// // if (ss) { -// // skillpower *= ssboost; -// // damage += skillpower; -// // } else -// // damage += skillpower; -// // } -// // } -// -// // defense modifier depending of the attacker weapon -// //ItemTemplate weapon = attacker.getActiveWeaponItem(); -// boolean isBow = false; -// if (weapon != null/* && !attacker.isTransformed() */) { -// switch (null) { -// case BOW: -// isBow = true; -// stat = StatType.BOW_WPN_VULN; -// break; -// case CROSSBOW: -// isBow = true; -// stat = StatType.CROSSBOW_WPN_VULN; -// break; -// case BLUNT: -// stat = StatType.BLUNT_WPN_VULN; -// break; -// case DAGGER: -// stat = StatType.DAGGER_WPN_VULN; -// break; -// case DUAL: -// stat = StatType.DUAL_WPN_VULN; -// break; -// case DUALFIST: -// stat = StatType.DUALFIST_WPN_VULN; -// break; -// case ETC: -// stat = StatType.ETC_WPN_VULN; -// break; -// case FIST: -// stat = StatType.FIST_WPN_VULN; -// break; -// case POLE: -// stat = StatType.POLE_WPN_VULN; -// break; -// case SWORD: -// stat = StatType.SWORD_WPN_VULN; -// break; -// case BIGSWORD: -// stat = StatType.BIGSWORD_WPN_VULN; -// break; -// case BIGBLUNT: -// stat = StatType.BIGBLUNT_WPN_VULN; -// break; -// case DUALDAGGER: -// stat = StatType.DUALDAGGER_WPN_VULN; -// break; -// case RAPIER: -// stat = StatType.RAPIER_WPN_VULN; -// break; -// case ANCIENTSWORD: -// stat = StatType.ANCIENT_WPN_VULN; -// break; -// /* -// * case PET: stat = Stats.PET_WPN_VULN; break; -// */ -// } -// } -// -// // for summon use pet weapon vuln, since they cant hold weapon -// // if (attacker instanceof L2SummonInstance) -// // stat = Stats.PET_WPN_VULN; -// -// // if (crit) { -// // // Finally retail like formula -// // damage = 2 -// // * attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, -// // target, skill) -// // * target.calcStat(Stats.CRIT_VULN, -// // target.getTemplate().baseCritVuln, target, -// // null) * (70 * damage / defense); -// // // Crit dmg add is almost useless in normal hits... -// // damage += (attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, 0, -// // target, skill) * 70 / defense); -// // } else -// // damage = 70 * damage / defense; -// -// if (stat != null) { -// // get the vulnerability due to skills (buffs, passives, -// // toggles, etc) -// damage = target.calcStat(stat, damage, target, null); -// /* -// * if (target instanceof L2Npc) { // get the natural -// * vulnerability for the template damage *= ((L2Npc) -// * target).getTemplate().getVulnerability(stat); } -// */ -// } -// -// // Weapon random damage -// damage *= attacker.getRandomDamageMultiplier(); -// -// // damage += Rnd.nextDouble() * damage / 10; -// // damage += _rnd.nextDouble()* -// // attacker.getRandomDamage(target); -// // } -// if (shld > 0 && Config.ALT_GAME_SHIELD_BLOCKS) { -// damage -= target.getShldDef(); -// if (damage < 0) -// damage = 0; -// } -// -// if (target instanceof L2Npc) { -// switch (((L2Npc) target).getTemplate().getRace()) { -// case BEAST: -// damage *= attacker.getPAtkMonsters(target); -// break; -// case ANIMAL: -// damage *= attacker.getPAtkAnimals(target); -// break; -// case PLANT: -// damage *= attacker.getPAtkPlants(target); -// break; -// case DRAGON: -// damage *= attacker.getPAtkDragons(target); -// break; -// case BUG: -// damage *= attacker.getPAtkInsects(target); -// break; -// case GIANT: -// damage *= attacker.getPAtkGiants(target); -// break; -// case MAGICCREATURE: -// damage *= attacker.getPAtkMagicCreatures(target); -// break; -// default: -// // nothing -// break; -// } -// } -// -// if (damage > 0 && damage < 1) { -// damage = 1; -// } else if (damage < 0) { -// damage = 0; -// } -// -// // Dmg bonusses in PvP fight -// if (isPvP) { -// if (skill == null) -// damage *= attacker.calcStat(Stats.PVP_PHYSICAL_DMG, 1, -// null, null); -// else -// damage *= attacker.calcStat(Stats.PVP_PHYS_SKILL_DMG, -// 1, null, null); -// } -// -// // Physical skill dmg boost -// if (skill != null) -// damage *= attacker.calcStat(Stats.PHYSICAL_SKILL_POWER, 1, -// null, null); -// -// damage *= calcElemental(attacker, target, skill); -// if (target instanceof L2Attackable) { -// if (isBow) { -// if (skill != null) -// damage *= attacker.calcStat( -// Stats.PVE_BOW_SKILL_DMG, 1, null, null); -// else -// damage *= attacker.calcStat(Stats.PVE_BOW_DMG, 1, -// null, null); -// } else -// damage *= attacker.calcStat(Stats.PVE_PHYSICAL_DMG, 1, -// null, null); -// if (!target.isRaid() -// && !target.isRaidMinion() -// && target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY -// && attacker.getActingPlayer() != null -// && (target.getLevel() - attacker.getActingPlayer() -// .getLevel()) >= 2) { -// int lvlDiff = target.getLevel() -// - attacker.getActingPlayer().getLevel() - 1; -// if (skill != null) { -// if (lvlDiff > Config.NPC_SKILL_DMG_PENALTY.size()) -// damage *= Config.NPC_SKILL_DMG_PENALTY -// .get(Config.NPC_SKILL_DMG_PENALTY -// .size()); -// else -// damage *= Config.NPC_SKILL_DMG_PENALTY -// .get(lvlDiff); -// } else if (crit) { -// if (lvlDiff > Config.NPC_CRIT_DMG_PENALTY.size()) -// damage *= Config.NPC_CRIT_DMG_PENALTY -// .get(Config.NPC_CRIT_DMG_PENALTY.size()); -// else -// damage *= Config.NPC_CRIT_DMG_PENALTY -// .get(lvlDiff); -// } else { -// if (lvlDiff > Config.NPC_DMG_PENALTY.size()) -// damage *= Config.NPC_DMG_PENALTY -// .get(Config.NPC_DMG_PENALTY.size()); -// else -// damage *= Config.NPC_DMG_PENALTY.get(lvlDiff); -// } -// } -// } -// -// return damage; + // // final boolean isPvP = (attacker instanceof L2Playable) && + // // (target instanceof L2Playable); + // // TODO soulshot charge + // boolean soulshot = false; + // + // double damage = attacker.getStats().getPhysicalAttack(); + // double defense = target.getStats().getPhysicalDefense(); + // // damage += calcValakasAttribute(attacker, target, skill); + // // if (attacker instanceof NPC) { + // // if (((NPC) attacker)._soulshotcharged) { + // // ss = true; + // // } else + // // ss = false; + // // ((L2Npc) attacker)._soulshotcharged = false; + // // } + // // TODO implement pvp + // // Def bonusses in PvP fight + // // if (isPvP) { + // // if (skill == null) + // // defence *= target.calcStat(Stats.PVP_PHYSICAL_DEF, 1, + // // null, null); + // // else + // // defence *= target.calcStat(Stats.PVP_PHYS_SKILL_DEF, 1, + // // null, null); + // // } + // + // // TODO implement shield + // // switch (shld) { + // // case SHIELD_DEFENSE_SUCCEED: + // // if (!Config.ALT_GAME_SHIELD_BLOCKS) + // // defense += target.getShldDef(); + // // break; + // // case SHIELD_DEFENSE_PERFECT_BLOCK: // perfect block + // // return 1.; + // // } + // + // if (soulshot) + // damage *= 2; + // // if (skill != null) { + // // double skillpower = skill.getPower(attacker, target, + // isPvP); + // // float ssboost = skill.getSSBoost(); + // // if (ssboost <= 0) + // // damage += skillpower; + // // else if (ssboost > 0) { + // // if (ss) { + // // skillpower *= ssboost; + // // damage += skillpower; + // // } else + // // damage += skillpower; + // // } + // // } + // + // // defense modifier depending of the attacker weapon + // //ItemTemplate weapon = attacker.getActiveWeaponItem(); + // boolean isBow = false; + // if (weapon != null/* && !attacker.isTransformed() */) { + // switch (null) { + // case BOW: + // isBow = true; + // stat = StatType.BOW_WPN_VULN; + // break; + // case CROSSBOW: + // isBow = true; + // stat = StatType.CROSSBOW_WPN_VULN; + // break; + // case BLUNT: + // stat = StatType.BLUNT_WPN_VULN; + // break; + // case DAGGER: + // stat = StatType.DAGGER_WPN_VULN; + // break; + // case DUAL: + // stat = StatType.DUAL_WPN_VULN; + // break; + // case DUALFIST: + // stat = StatType.DUALFIST_WPN_VULN; + // break; + // case ETC: + // stat = StatType.ETC_WPN_VULN; + // break; + // case FIST: + // stat = StatType.FIST_WPN_VULN; + // break; + // case POLE: + // stat = StatType.POLE_WPN_VULN; + // break; + // case SWORD: + // stat = StatType.SWORD_WPN_VULN; + // break; + // case BIGSWORD: + // stat = StatType.BIGSWORD_WPN_VULN; + // break; + // case BIGBLUNT: + // stat = StatType.BIGBLUNT_WPN_VULN; + // break; + // case DUALDAGGER: + // stat = StatType.DUALDAGGER_WPN_VULN; + // break; + // case RAPIER: + // stat = StatType.RAPIER_WPN_VULN; + // break; + // case ANCIENTSWORD: + // stat = StatType.ANCIENT_WPN_VULN; + // break; + // /* + // * case PET: stat = Stats.PET_WPN_VULN; break; + // */ + // } + // } + // + // // for summon use pet weapon vuln, since they cant hold + // weapon + // // if (attacker instanceof L2SummonInstance) + // // stat = Stats.PET_WPN_VULN; + // + // // if (crit) { + // // // Finally retail like formula + // // damage = 2 + // // * attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, + // // target, skill) + // // * target.calcStat(Stats.CRIT_VULN, + // // target.getTemplate().baseCritVuln, target, + // // null) * (70 * damage / defense); + // // // Crit dmg add is almost useless in normal hits... + // // damage += (attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, 0, + // // target, skill) * 70 / defense); + // // } else + // // damage = 70 * damage / defense; + // + // if (stat != null) { + // // get the vulnerability due to skills (buffs, passives, + // // toggles, etc) + // damage = target.calcStat(stat, damage, target, null); + // /* + // * if (target instanceof L2Npc) { // get the natural + // * vulnerability for the template damage *= ((L2Npc) + // * target).getTemplate().getVulnerability(stat); } + // */ + // } + // + // // Weapon random damage + // damage *= attacker.getRandomDamageMultiplier(); + // + // // damage += Rnd.nextDouble() * damage / 10; + // // damage += _rnd.nextDouble()* + // // attacker.getRandomDamage(target); + // // } + // if (shld > 0 && Config.ALT_GAME_SHIELD_BLOCKS) { + // damage -= target.getShldDef(); + // if (damage < 0) + // damage = 0; + // } + // + // if (target instanceof L2Npc) { + // switch (((L2Npc) target).getTemplate().getRace()) { + // case BEAST: + // damage *= attacker.getPAtkMonsters(target); + // break; + // case ANIMAL: + // damage *= attacker.getPAtkAnimals(target); + // break; + // case PLANT: + // damage *= attacker.getPAtkPlants(target); + // break; + // case DRAGON: + // damage *= attacker.getPAtkDragons(target); + // break; + // case BUG: + // damage *= attacker.getPAtkInsects(target); + // break; + // case GIANT: + // damage *= attacker.getPAtkGiants(target); + // break; + // case MAGICCREATURE: + // damage *= attacker.getPAtkMagicCreatures(target); + // break; + // default: + // // nothing + // break; + // } + // } + // + // if (damage > 0 && damage < 1) { + // damage = 1; + // } else if (damage < 0) { + // damage = 0; + // } + // + // // Dmg bonusses in PvP fight + // if (isPvP) { + // if (skill == null) + // damage *= attacker.calcStat(Stats.PVP_PHYSICAL_DMG, 1, + // null, null); + // else + // damage *= attacker.calcStat(Stats.PVP_PHYS_SKILL_DMG, + // 1, null, null); + // } + // + // // Physical skill dmg boost + // if (skill != null) + // damage *= attacker.calcStat(Stats.PHYSICAL_SKILL_POWER, 1, + // null, null); + // + // damage *= calcElemental(attacker, target, skill); + // if (target instanceof L2Attackable) { + // if (isBow) { + // if (skill != null) + // damage *= attacker.calcStat( + // Stats.PVE_BOW_SKILL_DMG, 1, null, null); + // else + // damage *= attacker.calcStat(Stats.PVE_BOW_DMG, 1, + // null, null); + // } else + // damage *= attacker.calcStat(Stats.PVE_PHYSICAL_DMG, 1, + // null, null); + // if (!target.isRaid() + // && !target.isRaidMinion() + // && target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY + // && attacker.getActingPlayer() != null + // && (target.getLevel() - attacker.getActingPlayer() + // .getLevel()) >= 2) { + // int lvlDiff = target.getLevel() + // - attacker.getActingPlayer().getLevel() - 1; + // if (skill != null) { + // if (lvlDiff > Config.NPC_SKILL_DMG_PENALTY.size()) + // damage *= Config.NPC_SKILL_DMG_PENALTY + // .get(Config.NPC_SKILL_DMG_PENALTY + // .size()); + // else + // damage *= Config.NPC_SKILL_DMG_PENALTY + // .get(lvlDiff); + // } else if (crit) { + // if (lvlDiff > Config.NPC_CRIT_DMG_PENALTY.size()) + // damage *= Config.NPC_CRIT_DMG_PENALTY + // .get(Config.NPC_CRIT_DMG_PENALTY.size()); + // else + // damage *= Config.NPC_CRIT_DMG_PENALTY + // .get(lvlDiff); + // } else { + // if (lvlDiff > Config.NPC_DMG_PENALTY.size()) + // damage *= Config.NPC_DMG_PENALTY + // .get(Config.NPC_DMG_PENALTY.size()); + // else + // damage *= Config.NPC_DMG_PENALTY.get(lvlDiff); + // } + // } + // } + // + // return damage; return 10; } }, new AttackCalculatorFunction(Integer.MAX_VALUE, diff --git a/src/main/java/com/l2jserver/model/template/AugmentTemplate.java b/src/main/java/com/l2jserver/model/template/AugmentTemplate.java index 5cd46b734..5bf34cb07 100644 --- a/src/main/java/com/l2jserver/model/template/AugmentTemplate.java +++ b/src/main/java/com/l2jserver/model/template/AugmentTemplate.java @@ -16,7 +16,6 @@ */ package com.l2jserver.model.template; - /** * Template for an Aumentation * diff --git a/src/main/java/com/l2jserver/model/template/capability/Dropable.java b/src/main/java/com/l2jserver/model/template/capability/Dropable.java index ad065e41c..9aff2d17c 100644 --- a/src/main/java/com/l2jserver/model/template/capability/Dropable.java +++ b/src/main/java/com/l2jserver/model/template/capability/Dropable.java @@ -25,5 +25,5 @@ import com.l2jserver.model.template.Template; * @author Rogiel */ public interface Dropable extends TemplateCapability { - + } diff --git a/src/main/java/com/l2jserver/model/template/capability/Enchantable.java b/src/main/java/com/l2jserver/model/template/capability/Enchantable.java index 82aee465e..5184d277d 100644 --- a/src/main/java/com/l2jserver/model/template/capability/Enchantable.java +++ b/src/main/java/com/l2jserver/model/template/capability/Enchantable.java @@ -25,5 +25,5 @@ import com.l2jserver.model.template.Template; * @author Rogiel */ public interface Enchantable extends TemplateCapability { - + } diff --git a/src/main/java/com/l2jserver/model/template/capability/Sellable.java b/src/main/java/com/l2jserver/model/template/capability/Sellable.java index 0097fe327..77bcbb863 100644 --- a/src/main/java/com/l2jserver/model/template/capability/Sellable.java +++ b/src/main/java/com/l2jserver/model/template/capability/Sellable.java @@ -25,5 +25,5 @@ import com.l2jserver.model.template.Template; * @author Rogiel */ public interface Sellable extends TemplateCapability { - + } diff --git a/src/main/java/com/l2jserver/model/template/character/CharacterRace.java b/src/main/java/com/l2jserver/model/template/character/CharacterRace.java index 05882a509..334a09845 100644 --- a/src/main/java/com/l2jserver/model/template/character/CharacterRace.java +++ b/src/main/java/com/l2jserver/model/template/character/CharacterRace.java @@ -6,8 +6,7 @@ package com.l2jserver.model.template.character; * @author Rogiel */ public enum CharacterRace { - HUMAN(0x00), ELF(0x01), DARK_ELF(0x02), ORC(0x03), DWARF(0x04), KAMAEL( - 0x05); + HUMAN(0x00), ELF(0x01), DARK_ELF(0x02), ORC(0x03), DWARF(0x04), KAMAEL(0x05); /** * The numeric ID representing this race diff --git a/src/main/java/com/l2jserver/model/world/L2Character.java b/src/main/java/com/l2jserver/model/world/L2Character.java index 3eeb66242..faef4ef2f 100644 --- a/src/main/java/com/l2jserver/model/world/L2Character.java +++ b/src/main/java/com/l2jserver/model/world/L2Character.java @@ -230,7 +230,7 @@ public class L2Character extends Player { desireUpdate(); this.petID = petID; } - + /** * @return the race */ diff --git a/src/main/java/com/l2jserver/model/world/Pet.java b/src/main/java/com/l2jserver/model/world/Pet.java index f5168a807..c10f60bf4 100644 --- a/src/main/java/com/l2jserver/model/world/Pet.java +++ b/src/main/java/com/l2jserver/model/world/Pet.java @@ -84,7 +84,9 @@ public class Pet extends Player { this.itemID = itemID; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see com.l2jserver.model.world.Actor#getStats() */ @Override diff --git a/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java b/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java index 505b2ec7a..3b010f34f 100644 --- a/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java +++ b/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java @@ -95,7 +95,7 @@ public class CharacterShortcutContainer implements Iterable { shortcut1.setPage(shortcut2.getPage()); shortcut2.setSlot(slot1); shortcut2.setPage(page1); - + Collections.sort(shortcuts, new ShortcutSlotComparator()); } @@ -137,7 +137,8 @@ public class CharacterShortcutContainer implements Iterable { return character; } - public static class ShortcutSlotComparator implements Comparator, Serializable { + public static class ShortcutSlotComparator implements Comparator, + Serializable { private static final long serialVersionUID = 1L; @Override diff --git a/src/main/java/com/l2jserver/model/world/character/CharacterStats.java b/src/main/java/com/l2jserver/model/world/character/CharacterStats.java index ef75955a9..55caef4ad 100644 --- a/src/main/java/com/l2jserver/model/world/character/CharacterStats.java +++ b/src/main/java/com/l2jserver/model/world/character/CharacterStats.java @@ -297,8 +297,7 @@ public class CharacterStats extends ActorStats { @SuppressWarnings("unchecked") private void setup() { - calculator.addNoSort(BASE_HP_FORMULA, BASE_MP_FORMULA, - BASE_CP_FORMULA); + calculator.addNoSort(BASE_HP_FORMULA, BASE_MP_FORMULA, BASE_CP_FORMULA); calculator.addNoSort(BASE_INT_FORMULA, BASE_STR_FORMULA, BASE_CON_FORMULA, BASE_MEN_FORMULA, BASE_DEX_FORMULA, diff --git a/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetSelectedEvent.java b/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetSelectedEvent.java index 601bab9df..a56c330a3 100644 --- a/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetSelectedEvent.java +++ b/src/main/java/com/l2jserver/model/world/character/event/CharacterTargetSelectedEvent.java @@ -45,8 +45,7 @@ public class CharacterTargetSelectedEvent implements CharacterEvent { * @param target * the character target */ - public CharacterTargetSelectedEvent(L2Character character, - Actor target) { + public CharacterTargetSelectedEvent(L2Character character, Actor target) { this.character = character; this.target = target; } diff --git a/src/main/java/com/l2jserver/model/world/npc/NPCStats.java b/src/main/java/com/l2jserver/model/world/npc/NPCStats.java index 557a511fb..19a501551 100644 --- a/src/main/java/com/l2jserver/model/world/npc/NPCStats.java +++ b/src/main/java/com/l2jserver/model/world/npc/NPCStats.java @@ -226,8 +226,7 @@ public class NPCStats extends ActorStats { BASE_CON_FORMULA, BASE_MEN_FORMULA, BASE_DEX_FORMULA, BASE_WIT_FORMULA); - calculator.addNoSort(BASE_RUN_SPEED_FORMULA, - BASE_WALK_SPEED_FORMULA); + calculator.addNoSort(BASE_RUN_SPEED_FORMULA, BASE_WALK_SPEED_FORMULA); calculator.addNoSort(BASE_PHYSICAL_ATTACK_FORMULA, BASE_PHYSICAL_ATTACK_SPEED_FORMULA, diff --git a/src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java b/src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java index bd13372d6..ba5d5d22e 100644 --- a/src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java +++ b/src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java @@ -80,8 +80,8 @@ public class BaseNPCController implements NPCController { * @return true if chat message was sent * @throws L2Exception */ - protected boolean talk(NPC npc, Lineage2Client conn, - L2Character character, String... args) throws L2Exception { + protected boolean talk(NPC npc, Lineage2Client conn, L2Character character, + String... args) throws L2Exception { String id = null; if (args.length >= 1) { id = args[0]; diff --git a/src/main/java/com/l2jserver/service/ServiceManager.java b/src/main/java/com/l2jserver/service/ServiceManager.java index 23e82a691..a6a26801f 100644 --- a/src/main/java/com/l2jserver/service/ServiceManager.java +++ b/src/main/java/com/l2jserver/service/ServiceManager.java @@ -114,8 +114,7 @@ public class ServiceManager { serviceClass.getSimpleName()); stopDependencies(service); service.stop(); - logger.info("{0}: Service stopped!", - serviceClass.getSimpleName()); + logger.info("{0}: Service stopped!", serviceClass.getSimpleName()); } catch (ServiceStopException e) { logger.error("{0}: Error stopping service: {1}", serviceClass.getSimpleName(), e.getCause()); @@ -163,8 +162,7 @@ public class ServiceManager { logger.debug("{0}: Restaring service...", serviceClass.getSimpleName()); service.restart(); - logger.info("{0}: Service restarted!", - serviceClass.getSimpleName()); + logger.info("{0}: Service restarted!", serviceClass.getSimpleName()); return service; } catch (ServiceStartException e) { logger.error("{0}: Error starting service: {1}", diff --git a/src/main/java/com/l2jserver/service/cache/EhCacheService.java b/src/main/java/com/l2jserver/service/cache/EhCacheService.java index 6c5f7d08a..62443e342 100644 --- a/src/main/java/com/l2jserver/service/cache/EhCacheService.java +++ b/src/main/java/com/l2jserver/service/cache/EhCacheService.java @@ -35,7 +35,8 @@ import com.l2jserver.service.ServiceStartException; import com.l2jserver.service.ServiceStopException; /** - * Simple cache that stores invocation results in a EhCache {@link Cache}. + * Simple cache that stores invocation results in a EhCache + * {@link net.sf.ehcache.Cache Cache}. * * @author Rogiel */ @@ -62,7 +63,7 @@ public class EhCacheService extends AbstractService implements CacheService { Preconditions.checkNotNull(interfaceType, "interfaceType"); Preconditions.checkNotNull(instance, "instance"); Preconditions.checkArgument(interfaceType.isInterface(), - "interfaceType is not an interface"); + "interfaceType is not an interface"); @SuppressWarnings("unchecked") final T proxy = (T) Proxy.newProxyInstance(this.getClass() diff --git a/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java b/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java index 7541cbe99..51aa03228 100644 --- a/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java +++ b/src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java @@ -252,7 +252,7 @@ public class ProxyConfigurationService extends AbstractService implements if (config == null) { for (final Class parent : clazz.getInterfaces()) { prop = findProperties(parent); - if(prop != null) + if (prop != null) return prop; } return null; diff --git a/src/main/java/com/l2jserver/service/database/DatabaseService.java b/src/main/java/com/l2jserver/service/database/DatabaseService.java index 568638786..0d749d071 100644 --- a/src/main/java/com/l2jserver/service/database/DatabaseService.java +++ b/src/main/java/com/l2jserver/service/database/DatabaseService.java @@ -30,8 +30,8 @@ import com.l2jserver.service.Service; * The service does not directly provide much functionality most of its * operations are done trough an {@link DataAccessObject}. Each service * implementation provides an custom interface that is used to link - * {@link DataAccessObject}-{@link DatabaseService Service}. See implementation specific - * documentation for more information. + * {@link DataAccessObject}-{@link DatabaseService Service}. See implementation + * specific documentation for more information. * * @author Rogiel */ diff --git a/src/main/java/com/l2jserver/service/database/JDBCDatabaseConfiguration.java b/src/main/java/com/l2jserver/service/database/JDBCDatabaseConfiguration.java index 9e3f321eb..e5ebdcd98 100644 --- a/src/main/java/com/l2jserver/service/database/JDBCDatabaseConfiguration.java +++ b/src/main/java/com/l2jserver/service/database/JDBCDatabaseConfiguration.java @@ -86,7 +86,7 @@ public interface JDBCDatabaseConfiguration extends DatabaseConfiguration { */ @ConfigurationPropertySetter(name = "jdbc.active.max") void setMaxActiveConnections(int password); - + /** * @return the maximum number of idle connections */ @@ -99,7 +99,7 @@ public interface JDBCDatabaseConfiguration extends DatabaseConfiguration { */ @ConfigurationPropertySetter(name = "jdbc.idle.max") void setMaxIdleConnections(int password); - + /** * @return the minimum number of idle connections */ diff --git a/src/main/java/com/l2jserver/service/game/PvPService.java b/src/main/java/com/l2jserver/service/game/PvPService.java index 9d6166d1a..f4e539ef7 100644 --- a/src/main/java/com/l2jserver/service/game/PvPService.java +++ b/src/main/java/com/l2jserver/service/game/PvPService.java @@ -24,5 +24,5 @@ import com.l2jserver.service.Service; * @author Rogiel */ public interface PvPService extends Service { - + } diff --git a/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java b/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java index ccc487337..9cb5c3595 100644 --- a/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java +++ b/src/main/java/com/l2jserver/service/game/admin/AdministratorService.java @@ -38,8 +38,8 @@ public interface AdministratorService extends Service { * @param args * the arguments */ - void command(Lineage2Client conn, L2Character character, - String command, String... args); + void command(Lineage2Client conn, L2Character character, String command, + String... args); /** * The base interface for Administrator commands diff --git a/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java b/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java index 6c67ee684..00c1884a2 100644 --- a/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java @@ -70,16 +70,16 @@ public class AIServiceImpl extends AbstractService implements AIService { @Override protected void doStart() throws ServiceStartException { - + } @Override public void walk(Actor actor, Coordinate coordinate) { - + } @Override protected void doStop() throws ServiceStopException { - + } } diff --git a/src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java b/src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java index 13a8b3f63..dd9e97e5b 100644 --- a/src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java +++ b/src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java @@ -21,7 +21,6 @@ package com.l2jserver.service.game.character; * * @author Rogiel */ -public class CannotSetTargetServiceException extends - CharacterServiceException { +public class CannotSetTargetServiceException extends CharacterServiceException { private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java b/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java index 6311cf147..b5ea68d51 100644 --- a/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java +++ b/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java @@ -21,7 +21,6 @@ package com.l2jserver.service.game.character; * * @author Rogiel */ -public class CharacterInJailServiceException extends - CharacterServiceException { +public class CharacterInJailServiceException extends CharacterServiceException { private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java b/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java index cb7a7e7e0..27d609e9d 100644 --- a/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java @@ -185,8 +185,7 @@ public class CharacterServiceImpl extends AbstractService implements }); // register global chat listener - chatService.getGlobalChannel().addMessageListener( - globalChatListener); + chatService.getGlobalChannel().addMessageListener(globalChatListener); chatService.getTradeChannel().addMessageListener(tradeChatListener); // query client game guard -- if key is invalid, the connection will be diff --git a/src/main/java/com/l2jserver/service/game/chat/ChatBanActiveChatServiceException.java b/src/main/java/com/l2jserver/service/game/chat/ChatBanActiveChatServiceException.java index b1db9aeb2..7665a5fad 100644 --- a/src/main/java/com/l2jserver/service/game/chat/ChatBanActiveChatServiceException.java +++ b/src/main/java/com/l2jserver/service/game/chat/ChatBanActiveChatServiceException.java @@ -16,14 +16,11 @@ */ package com.l2jserver.service.game.chat; - /** - * Exception thrown if the player trying to send a message is currently - * banned. + * Exception thrown if the player trying to send a message is currently banned. * * @author Rogiel */ -public class ChatBanActiveChatServiceException extends - ChatServiceException { +public class ChatBanActiveChatServiceException extends ChatServiceException { private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java b/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java index c0f192fb1..65bed03f5 100644 --- a/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java +++ b/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java @@ -327,10 +327,11 @@ public class SimpleChatService extends AbstractService implements ChatService { public ChatMessageType getMessageType() { return ChatMessageType.ALL; } - + @Override public void dispose() { - throw new UnsupportedOperationException("Cannot dispose the Global Chat Channel"); + throw new UnsupportedOperationException( + "Cannot dispose the Global Chat Channel"); } } @@ -345,10 +346,11 @@ public class SimpleChatService extends AbstractService implements ChatService { public ChatMessageType getMessageType() { return ChatMessageType.TRADE; } - + @Override public void dispose() { - throw new UnsupportedOperationException("Cannot dispose the Trade Chat Channel"); + throw new UnsupportedOperationException( + "Cannot dispose the Trade Chat Channel"); } } @@ -363,10 +365,11 @@ public class SimpleChatService extends AbstractService implements ChatService { public ChatMessageType getMessageType() { return ChatMessageType.ANNOUNCEMENT; } - + @Override public void dispose() { - throw new UnsupportedOperationException("Cannot dispose the Announcement Chat Channel"); + throw new UnsupportedOperationException( + "Cannot dispose the Announcement Chat Channel"); } } @@ -396,7 +399,7 @@ public class SimpleChatService extends AbstractService implements ChatService { public ChatMessageType getMessageType() { return ChatMessageType.CLAN; } - + @Override public void dispose() { clanChannels.remove(clanID); @@ -430,7 +433,7 @@ public class SimpleChatService extends AbstractService implements ChatService { public ChatMessageType getMessageType() { return ChatMessageType.ALL; } - + @Override public void dispose() { throw new UnsupportedOperationException(); diff --git a/src/main/java/com/l2jserver/service/game/map/MapService.java b/src/main/java/com/l2jserver/service/game/map/MapService.java index 47ecd6b39..24eb3833b 100644 --- a/src/main/java/com/l2jserver/service/game/map/MapService.java +++ b/src/main/java/com/l2jserver/service/game/map/MapService.java @@ -24,5 +24,5 @@ import com.l2jserver.service.Service; * @author Rogiel */ public interface MapService extends Service { - + } diff --git a/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java b/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java index 59c99c153..d14a030f9 100644 --- a/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java @@ -142,8 +142,7 @@ public class NPCServiceImpl extends AbstractService implements NPCService { Preconditions.checkNotNull(character, "character"); Preconditions.checkNotNull(action, "action"); - final Lineage2Client conn = networkService.discover(character - .getID()); + final Lineage2Client conn = networkService.discover(character.getID()); try { final NPCController controller = getController(npc); controller.action(npc, conn, character, new String[0]); @@ -160,8 +159,7 @@ public class NPCServiceImpl extends AbstractService implements NPCService { if (args == null) args = new String[0]; - final Lineage2Client conn = networkService.discover(character - .getID()); + final Lineage2Client conn = networkService.discover(character.getID()); try { final NPCController controller = getController(npc); controller.action(npc, conn, character, args); diff --git a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ClassFileManager.java b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ClassFileManager.java index 3ee47b569..9a1c7e724 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ClassFileManager.java +++ b/src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ClassFileManager.java @@ -197,8 +197,9 @@ public class ClassFileManager extends * if something foes wrong */ @Override - public synchronized Iterable list(Location location, String packageName, - Set kinds, boolean recurse) throws IOException { + public synchronized Iterable list(Location location, + String packageName, Set kinds, boolean recurse) + throws IOException { Iterable objects = super.list(location, packageName, kinds, recurse); diff --git a/src/main/java/com/l2jserver/service/game/spawn/AlreadySpawnedServiceException.java b/src/main/java/com/l2jserver/service/game/spawn/AlreadySpawnedServiceException.java index b81dc9279..9a4ed6203 100644 --- a/src/main/java/com/l2jserver/service/game/spawn/AlreadySpawnedServiceException.java +++ b/src/main/java/com/l2jserver/service/game/spawn/AlreadySpawnedServiceException.java @@ -16,7 +16,6 @@ */ package com.l2jserver.service.game.spawn; - /** * Exception thrown when the object is already spawned and registered in the * world diff --git a/src/main/java/com/l2jserver/service/game/spawn/NotSpawnedServiceException.java b/src/main/java/com/l2jserver/service/game/spawn/NotSpawnedServiceException.java index 574bb4bf5..c611cee5d 100644 --- a/src/main/java/com/l2jserver/service/game/spawn/NotSpawnedServiceException.java +++ b/src/main/java/com/l2jserver/service/game/spawn/NotSpawnedServiceException.java @@ -16,7 +16,6 @@ */ package com.l2jserver.service.game.spawn; - /** * Exception thrown when trying to unspawn an object that is not spawned * diff --git a/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java b/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java index 715b43e59..1460293f6 100644 --- a/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java @@ -135,14 +135,13 @@ public class SpawnServiceImpl extends AbstractService implements SpawnService { Preconditions.checkNotNull(object, "object"); Preconditions.checkArgument(time > 0, "time < 0"); Preconditions.checkNotNull(unit, "unit"); - return threadService.async(time, unit, - new Callable() { - @Override - public T call() throws Exception { - spawn(object, point); - return object; - } - }); + return threadService.async(time, unit, new Callable() { + @Override + public T call() throws Exception { + spawn(object, point); + return object; + } + }); } @Override @@ -176,19 +175,18 @@ public class SpawnServiceImpl extends AbstractService implements SpawnService { } @Override - public AsyncFuture unspawn(final T object, long time, - TimeUnit unit) { + public AsyncFuture unspawn( + final T object, long time, TimeUnit unit) { Preconditions.checkNotNull(object, "object"); Preconditions.checkArgument(time > 0, "time <= 0"); Preconditions.checkNotNull(unit, "unit"); - return threadService.async(time, unit, - new Callable() { - @Override - public T call() throws Exception { - unspawn(object); - return object; - } - }); + return threadService.async(time, unit, new Callable() { + @Override + public T call() throws Exception { + unspawn(object); + return object; + } + }); } @Override diff --git a/src/main/java/com/l2jserver/service/game/template/TemplateService.java b/src/main/java/com/l2jserver/service/game/template/TemplateService.java index cdf0daffb..878a0ebc3 100644 --- a/src/main/java/com/l2jserver/service/game/template/TemplateService.java +++ b/src/main/java/com/l2jserver/service/game/template/TemplateService.java @@ -27,10 +27,11 @@ import com.l2jserver.service.Service; /** * Service that loads {@link L2Character}, {@link NPC}, {@link Item} and - * {@link Skill} {@link Template templates}. The service on startup, loads from files or from the - * database the data and parses them into com.l2jserver.model.template - * classes. Once they are loaded, templates can be retrieved using any - * {@link TemplateID} object created from a {@link TemplateIDProvider}. + * {@link Skill} {@link Template templates}. The service on startup, loads from + * files or from the database the data and parses them into + * com.l2jserver.model.template classes. Once they are loaded, + * templates can be retrieved using any {@link TemplateID} object created from a + * {@link TemplateIDProvider}. * * @author Rogiel */ diff --git a/src/main/java/com/l2jserver/service/network/NetworkService.java b/src/main/java/com/l2jserver/service/network/NetworkService.java index f461de0d4..e70829eca 100644 --- a/src/main/java/com/l2jserver/service/network/NetworkService.java +++ b/src/main/java/com/l2jserver/service/network/NetworkService.java @@ -37,7 +37,8 @@ import com.l2jserver.service.Service; *
  • Process incoming connections and filter them for blocked IPs (not yet * implemented);
    • *
  • Handshake with the client and enable Cryptography;
    • - *
  • Read incoming packets, decrypt and parse them into a ClientPacket;
    • + *
  • Read incoming packets, decrypt and parse them into a {@link ClientPacket} + * ;
    • *
  • Write outgoing packets ServerPacket and encrypt them;
    • *
  • (optional) Validate GameGuard responses (see GameGuardService);
    • * diff --git a/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java b/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java index 14ce135c3..9d81ea180 100644 --- a/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java +++ b/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java @@ -170,8 +170,8 @@ public class BroadcastServiceImpl extends AbstractService implements * @param point * the old point */ - private void broadcastUpdate(Lineage2Client conn, - L2Character character, Point3D point) { + private void broadcastUpdate(Lineage2Client conn, L2Character character, + Point3D point) { for (final WorldObject o : worldService .iterable(new KnownListUpdateFilter(character, point))) { broadcast(conn, o); diff --git a/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java b/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java index c0102f75c..c5d27f61f 100644 --- a/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java +++ b/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java @@ -129,7 +129,7 @@ public class ComplexCalculator> } sort(); } - + /** * Adds a new function to this calculator. Executing order for functions * with the same order is undefined. @@ -228,7 +228,7 @@ public class ComplexCalculator> } } } - + public void sort() { for (final List> funcs : functions.values()) { Collections.sort(funcs, FunctionOrderComparator.SHARED_INSTANCE); @@ -267,7 +267,7 @@ public class ComplexCalculator> public static class FunctionOrderComparator implements Comparator>, Serializable { private static final long serialVersionUID = 1L; - + public static final FunctionOrderComparator SHARED_INSTANCE = new FunctionOrderComparator(); @Override diff --git a/src/main/java/com/l2jserver/util/calculator/Function.java b/src/main/java/com/l2jserver/util/calculator/Function.java index 7fdf30d78..94cd61a4a 100644 --- a/src/main/java/com/l2jserver/util/calculator/Function.java +++ b/src/main/java/com/l2jserver/util/calculator/Function.java @@ -39,6 +39,6 @@ public interface Function> { * @return the order this function will be executed */ int order(); - + V type(); } diff --git a/src/main/java/com/l2jserver/util/html/markup/HtmlTemplate.java b/src/main/java/com/l2jserver/util/html/markup/HtmlTemplate.java index 13260f03e..17ffffd8d 100644 --- a/src/main/java/com/l2jserver/util/html/markup/HtmlTemplate.java +++ b/src/main/java/com/l2jserver/util/html/markup/HtmlTemplate.java @@ -117,7 +117,7 @@ public abstract class HtmlTemplate { variables.put(name, value); return this; } - + /** * Register an variable for this template * diff --git a/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java b/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java index 94c5c7b84..25436329d 100644 --- a/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java +++ b/src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java @@ -34,8 +34,8 @@ import com.l2jserver.service.game.template.TemplateService; import com.l2jserver.service.game.world.WorldService; public class MySQL5CharacterDAOTest { - private final Injector injector = Guice - .createInjector(Stage.PRODUCTION, new GameServerModule()); + private final Injector injector = Guice.createInjector(Stage.PRODUCTION, + new GameServerModule()); @Test public void testCachedLoad() throws ServiceStartException { diff --git a/src/test/java/com/l2jserver/service/cache/SimpleCacheServiceTest.java b/src/test/java/com/l2jserver/service/cache/SimpleCacheServiceTest.java index 9d42e4215..398b75bd5 100644 --- a/src/test/java/com/l2jserver/service/cache/SimpleCacheServiceTest.java +++ b/src/test/java/com/l2jserver/service/cache/SimpleCacheServiceTest.java @@ -27,7 +27,7 @@ import com.l2jserver.service.ServiceStartException; public class SimpleCacheServiceTest { private final EhCacheService cacheService = new EhCacheService(); - + @Before public void tearUp() throws ServiceStartException { cacheService.start();