Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-06 07:32:46 +00:00
Code Releases Activity

Code formatting

Browse Source
This commit is contained in:
Rogiel Sulzbach
2011-08-07 22:31:55 -03:00
parent 129b527a08
commit 074f216ffc
65 changed files with 378 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterDAO.java
View File

@@ -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));

8
src/dao/com/l2jserver/db/dao/jdbc/JDBCClanDAO.java
View File

@@ -41,8 +41,8 @@ import com.l2jserver.service.database.JDBCDatabaseService.SelectSingleQuery;
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public abstract class JDBCClanDAO extends AbstractJDBCDAO<Clan, ClanID> implements
ClanDAO {
public abstract class JDBCClanDAO extends AbstractJDBCDAO<Clan, ClanID>
implements ClanDAO {
/**
* The {@link ClanID} factory
*/
@@ -62,8 +62,8 @@ public abstract class JDBCClanDAO extends AbstractJDBCDAO<Clan, ClanID> 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;

4
src/dao/com/l2jserver/db/dao/jdbc/JDBCItemDAO.java
View File

@@ -48,8 +48,8 @@ import com.l2jserver.util.geometry.Coordinate;
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public abstract class JDBCItemDAO extends AbstractJDBCDAO<Item, ItemID> implements
ItemDAO {
public abstract class JDBCItemDAO extends AbstractJDBCDAO<Item, ItemID>
implements ItemDAO {
/**
* The {@link ItemID} factory
*/

3
src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterDAO.java
View File

@@ -30,8 +30,7 @@ import com.l2jserver.service.database.DatabaseService;
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class H2CharacterDAO extends JDBCCharacterDAO implements
CharacterDAO {
public class H2CharacterDAO extends JDBCCharacterDAO implements CharacterDAO {
@Inject
public H2CharacterDAO(DatabaseService database,
CharacterIDProvider idFactory,

4
src/dao/com/l2jserver/db/dao/jdbc/h2/H2ClanDAO.java
View File

@@ -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);
}
}

3
src/main/java/com/l2jserver/game/net/handler/Lineage2PacketHandler.java
View File

@@ -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 <a href="http://www.rogiel.com">Rogiel</a>
*/

3
src/main/java/com/l2jserver/game/net/packet/client/CM_ATTACK.java
View File

@@ -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;
}

4
src/main/java/com/l2jserver/game/net/packet/client/CM_AUTH_LOGIN.java
View File

@@ -86,8 +86,8 @@ public class CM_AUTH_LOGIN extends AbstractClientPacket {
loginKey1, loginKey2));
final List<L2Character> 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()])));
}
/**

3
src/main/java/com/l2jserver/game/net/packet/client/CM_BYPASS.java
View File

@@ -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;
}

3
src/main/java/com/l2jserver/game/net/packet/client/CM_CHAR_ACTION.java
View File

@@ -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;
}

2
src/main/java/com/l2jserver/game/net/packet/client/CM_CHAT.java
View File

@@ -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);
}
}

2
src/main/java/com/l2jserver/game/net/packet/client/CM_ENTER_WORLD.java
View File

@@ -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
}
}
}

4
src/main/java/com/l2jserver/game/net/packet/client/CM_EXT_REQ_MANOR_LIST.java
View File

@@ -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"));
}
}

4
src/main/java/com/l2jserver/game/net/packet/client/CM_GOTO_LOBBY.java
View File

@@ -61,7 +61,7 @@ public class CM_GOTO_LOBBY extends AbstractClientPacket {
public void process(final Lineage2Client conn) {
final List<L2Character> 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])));
}
}

3
src/main/java/com/l2jserver/game/net/packet/client/CM_LOGOUT.java
View File

@@ -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) {

6
src/main/java/com/l2jserver/game/net/packet/server/SM_CHAT.java
View File

@@ -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;

10
src/main/java/com/l2jserver/game/net/packet/server/SM_NPC_INFO.java
View File

@@ -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());

3
src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java
View File

@@ -30,8 +30,7 @@ import com.l2jserver.service.game.template.TemplateService;
*/
public class CharacterTemplateID extends ActorTemplateID<CharacterTemplate> {
@Inject
public CharacterTemplateID(@Assisted int id,
TemplateService templateService) {
public CharacterTemplateID(@Assisted int id, TemplateService templateService) {
super(id, templateService);
}
}

498
src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java
View File

@@ -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,

1
src/main/java/com/l2jserver/model/template/AugmentTemplate.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jserver.model.template;
/**
* Template for an Aumentation
*

3
src/main/java/com/l2jserver/model/template/character/CharacterRace.java
View File

@@ -6,8 +6,7 @@ package com.l2jserver.model.template.character;
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
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

4
src/main/java/com/l2jserver/model/world/Pet.java
View File

@@ -84,7 +84,9 @@ public class Pet extends Player {
this.itemID = itemID;
}
/* (non-Javadoc)
/*
* (non-Javadoc)
*
* @see com.l2jserver.model.world.Actor#getStats()
*/
@Override

3
src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java
View File

@@ -137,7 +137,8 @@ public class CharacterShortcutContainer implements Iterable<Shortcut> {
return character;
}
public static class ShortcutSlotComparator implements Comparator<Shortcut>, Serializable {
public static class ShortcutSlotComparator implements Comparator<Shortcut>,
Serializable {
private static final long serialVersionUID = 1L;
@Override

3
src/main/java/com/l2jserver/model/world/character/CharacterStats.java
View File

@@ -297,8 +297,7 @@ public class CharacterStats extends ActorStats<CharacterCalculatorContext> {
@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,

3
src/main/java/com/l2jserver/model/world/character/event/CharacterTargetSelectedEvent.java
View File

@@ -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;
}

3
src/main/java/com/l2jserver/model/world/npc/NPCStats.java
View File

@@ -226,8 +226,7 @@ public class NPCStats extends ActorStats<NPCCalculatorContext> {
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,

4
src/main/java/com/l2jserver/model/world/npc/controller/BaseNPCController.java
View File

@@ -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];

6
src/main/java/com/l2jserver/service/ServiceManager.java
View File

@@ -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}",

5
src/main/java/com/l2jserver/service/cache/EhCacheService.java vendored
View File

@@ -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 <a href="http://www.rogiel.com">Rogiel</a>
*/
@@ -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()

2
src/main/java/com/l2jserver/service/configuration/ProxyConfigurationService.java
View File

@@ -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;

4
src/main/java/com/l2jserver/service/database/DatabaseService.java
View File

@@ -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 <a href="http://www.rogiel.com">Rogiel</a>
*/

4
src/main/java/com/l2jserver/service/game/admin/AdministratorService.java
View File

@@ -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

3
src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java
View File

@@ -21,7 +21,6 @@ package com.l2jserver.service.game.character;
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class CannotSetTargetServiceException extends
CharacterServiceException {
public class CannotSetTargetServiceException extends CharacterServiceException {
private static final long serialVersionUID = 1L;
}

3
src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java
View File

@@ -21,7 +21,6 @@ package com.l2jserver.service.game.character;
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class CharacterInJailServiceException extends
CharacterServiceException {
public class CharacterInJailServiceException extends CharacterServiceException {
private static final long serialVersionUID = 1L;
}

3
src/main/java/com/l2jserver/service/game/character/CharacterServiceImpl.java
View File

@@ -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

7
src/main/java/com/l2jserver/service/game/chat/ChatBanActiveChatServiceException.java
View File

@@ -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 <a href="http://www.rogiel.com">Rogiel</a>
*/
public class ChatBanActiveChatServiceException extends
ChatServiceException {
public class ChatBanActiveChatServiceException extends ChatServiceException {
private static final long serialVersionUID = 1L;
}

9
src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java
View File

@@ -330,7 +330,8 @@ public class SimpleChatService extends AbstractService implements ChatService {
@Override
public void dispose() {
throw new UnsupportedOperationException("Cannot dispose the Global Chat Channel");
throw new UnsupportedOperationException(
"Cannot dispose the Global Chat Channel");
}
}
@@ -348,7 +349,8 @@ public class SimpleChatService extends AbstractService implements ChatService {
@Override
public void dispose() {
throw new UnsupportedOperationException("Cannot dispose the Trade Chat Channel");
throw new UnsupportedOperationException(
"Cannot dispose the Trade Chat Channel");
}
}
@@ -366,7 +368,8 @@ public class SimpleChatService extends AbstractService implements ChatService {
@Override
public void dispose() {
throw new UnsupportedOperationException("Cannot dispose the Announcement Chat Channel");
throw new UnsupportedOperationException(
"Cannot dispose the Announcement Chat Channel");
}
}

6
src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java
View File

@@ -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);

5
src/main/java/com/l2jserver/service/game/scripting/impl/javacc/ClassFileManager.java
View File

@@ -197,8 +197,9 @@ public class ClassFileManager extends
* if something foes wrong
*/
@Override
public synchronized Iterable<JavaFileObject> list(Location location, String packageName,
Set<Kind> kinds, boolean recurse) throws IOException {
public synchronized Iterable<JavaFileObject> list(Location location,
String packageName, Set<Kind> kinds, boolean recurse)
throws IOException {
Iterable<JavaFileObject> objects = super.list(location, packageName,
kinds, recurse);

1
src/main/java/com/l2jserver/service/game/spawn/AlreadySpawnedServiceException.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jserver.service.game.spawn;
/**
* Exception thrown when the object is already spawned and registered in the
* world

1
src/main/java/com/l2jserver/service/game/spawn/NotSpawnedServiceException.java
View File

@@ -16,7 +16,6 @@
*/
package com.l2jserver.service.game.spawn;
/**
* Exception thrown when trying to unspawn an object that is not spawned
*

34
src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java
View File

@@ -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<T>() {
@Override
public T call() throws Exception {
spawn(object, point);
return object;
}
});
return threadService.async(time, unit, new Callable<T>() {
@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 <T extends PositionableObject> AsyncFuture<T> unspawn(final T object, long time,
TimeUnit unit) {
public <T extends PositionableObject> AsyncFuture<T> 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<T>() {
@Override
public T call() throws Exception {
unspawn(object);
return object;
}
});
return threadService.async(time, unit, new Callable<T>() {
@Override
public T call() throws Exception {
unspawn(object);
return object;
}
});
}
@Override

9
src/main/java/com/l2jserver/service/game/template/TemplateService.java
View File

@@ -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 <tt>com.l2jserver.model.template</tt>
* 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
* <tt>com.l2jserver.model.template</tt> classes. Once they are loaded,
* templates can be retrieved using any {@link TemplateID} object created from a
* {@link TemplateIDProvider}.
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/

3
src/main/java/com/l2jserver/service/network/NetworkService.java
View File

@@ -37,7 +37,8 @@ import com.l2jserver.service.Service;
* <li>Process incoming connections and filter them for blocked IPs (not yet
* implemented);</li>
* <li>Handshake with the client and enable Cryptography;</li>
* <li>Read incoming packets, decrypt and parse them into a ClientPacket;</li>
* <li>Read incoming packets, decrypt and parse them into a {@link ClientPacket}
* ;</li>
* <li>Write outgoing packets ServerPacket and encrypt them;</li>
* <li>(optional) Validate GameGuard responses (see GameGuardService);</li>
* </ul>

4
src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java
View File

@@ -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);

4
src/test/java/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAOTest.java
View File

@@ -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 {