Code formatting

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

src/dao/com/l2jserver/db/dao/jdbc/JDBCClanDAO.java

@@ -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
+public abstract class JDBCClanDAO extends AbstractJDBCDAO<Clan, ClanID>
-		ClanDAO {
+		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,
+	public JDBCClanDAO(DatabaseService database, ClanIDProvider clanIdFactory,
-			ClanIDProvider clanIdFactory, final CharacterIDProvider idFactory) {
+			final CharacterIDProvider idFactory) {
 		super(database);
 		this.idFactory = clanIdFactory;
 		this.charIdFactory = idFactory;

src/dao/com/l2jserver/db/dao/jdbc/JDBCItemDAO.java

@@ -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
+public abstract class JDBCItemDAO extends AbstractJDBCDAO<Item, ItemID>
-		ItemDAO {
+		implements ItemDAO {
 	/**
 	 * The {@link ItemID} factory
 	 */

src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterDAO.java

@@ -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
+public class H2CharacterDAO extends JDBCCharacterDAO implements CharacterDAO {
-		CharacterDAO {
 	@Inject
 	public H2CharacterDAO(DatabaseService database,
 			CharacterIDProvider idFactory,

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,
+	public H2ClanDAO(DatabaseService database, ClanIDProvider clanIdFactory,
-			ClanIDProvider clanIdFactory, CharacterIDProvider idFactory) {
+			CharacterIDProvider idFactory) {
 		super(database, clanIdFactory, idFactory);
 	}
 }

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
+ * method and creates a new {@link Lineage2Client} once a new channel is open.
- * open.
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */

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,
+	public CM_ATTACK(CharacterService charService, ObjectIDResolver idResolver) {
-			ObjectIDResolver idResolver) {
 		this.charService = charService;
 		this.idResolver = idResolver;
 	}

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<L2Character> chars = characterDao.selectByAccount(accountId);
-		conn.write(SM_CHAR_LIST.fromL2Session(
+		conn.write(SM_CHAR_LIST.fromL2Session(conn.getSession(),
-				conn.getSession(), chars.toArray(new L2Character[chars.size()])));
+				chars.toArray(new L2Character[chars.size()])));
 	}
 
 	/**

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

@@ -62,8 +62,7 @@ public class CM_BYPASS extends AbstractClientPacket {
 	private String command;
 
 	@Inject
-	public CM_BYPASS(ObjectIDResolver idResolver,
+	public CM_BYPASS(ObjectIDResolver idResolver, NPCService npcService) {
-			NPCService npcService) {
 		this.idResolver = idResolver;
 		this.npcService = npcService;
 	}

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,
+	public CM_CHAR_ACTION(ObjectIDResolver idResolver, NPCService npcService) {
-			NPCService npcService) {
 		this.idResolver = idResolver;
 		this.npcService = npcService;
 	}

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",
+		conn.write(new SM_MANOR_LIST("gludio", "dion", "giran", "oren", "aden",
-				"aden", "innadril", "goddard", "rune", "schuttgart"));
+				"innadril", "goddard", "rune", "schuttgart"));
 	}
 }

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<L2Character> chars = characterDao.selectByAccount(conn
 				.getSession().getAccountID());
-		conn.write(SM_CHAR_LIST.fromL2Session(
+		conn.write(SM_CHAR_LIST.fromL2Session(conn.getSession(),
-				conn.getSession(), chars.toArray(new L2Character[0])));
+				chars.toArray(new L2Character[0])));
 	}
 }

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
+	private static final Logger log = LoggerFactory.getLogger(CM_LOGOUT.class);
-			.getLogger(CM_LOGOUT.class);
 
 	@Override
 	public void read(Lineage2Client conn, ChannelBuffer buffer) {

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,
+	public SM_CHAT(Actor character, ChatMessageType destination, String message) {
-			String message) {
 		super(OPCODE);
 		this.actor = character;
 		this.destination = destination;
 		this.message = message;
 	}
 
-	public SM_CHAT(Actor actor, ChatMessageType destination,
+	public SM_CHAT(Actor actor, ChatMessageType destination, int messageID) {
-			int messageID) {
 		super(OPCODE);
 		this.actor = actor;
 		this.destination = destination;

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<CharacterTemplate> {
 	@Inject
-	public CharacterTemplateID(@Assisted int id,
+	public CharacterTemplateID(@Assisted int id, TemplateService templateService) {
-			TemplateService templateService) {
 		super(id, templateService);
 	}
 }

src/main/java/com/l2jserver/model/server/attack/PhysicalAttackCalculator.java

@@ -67,7 +67,8 @@ public class PhysicalAttackCalculator extends AttackCalculator {
 				// if (soulshot)
 				// damage *= 2;
 				// // if (skill != null) {
-//				// double skillpower = skill.getPower(attacker, target, isPvP);
+				// // double skillpower = skill.getPower(attacker, target,
+				// isPvP);
 				// // float ssboost = skill.getSSBoost();
 				// // if (ssboost <= 0)
 				// // damage += skillpower;
@@ -138,7 +139,8 @@ public class PhysicalAttackCalculator extends AttackCalculator {
 				// }
 				// }
 				//
-//				// for summon use pet weapon vuln, since they cant hold weapon
+				// // for summon use pet weapon vuln, since they cant hold
+				// weapon
 				// // if (attacker instanceof L2SummonInstance)
 				// // stat = Stats.PET_WPN_VULN;
 				//

src/main/java/com/l2jserver/model/template/AugmentTemplate.java

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

src/main/java/com/l2jserver/model/template/character/CharacterRace.java

@@ -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(
+	HUMAN(0x00), ELF(0x01), DARK_ELF(0x02), ORC(0x03), DWARF(0x04), KAMAEL(0x05);
-			0x05);
 
 	/**
 	 * The numeric ID representing this race

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

src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java

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

src/main/java/com/l2jserver/model/world/character/CharacterStats.java

@@ -297,8 +297,7 @@ public class CharacterStats extends ActorStats<CharacterCalculatorContext> {
 
 	@SuppressWarnings("unchecked")
 	private void setup() {
-		calculator.addNoSort(BASE_HP_FORMULA, BASE_MP_FORMULA,
+		calculator.addNoSort(BASE_HP_FORMULA, BASE_MP_FORMULA, BASE_CP_FORMULA);
-				BASE_CP_FORMULA);
 
 		calculator.addNoSort(BASE_INT_FORMULA, BASE_STR_FORMULA,
 				BASE_CON_FORMULA, BASE_MEN_FORMULA, BASE_DEX_FORMULA,

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,
+	public CharacterTargetSelectedEvent(L2Character character, Actor target) {
-			Actor target) {
 		this.character = character;
 		this.target = target;
 	}

src/main/java/com/l2jserver/model/world/npc/NPCStats.java

@@ -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,
+		calculator.addNoSort(BASE_RUN_SPEED_FORMULA, BASE_WALK_SPEED_FORMULA);
-				BASE_WALK_SPEED_FORMULA);
 
 		calculator.addNoSort(BASE_PHYSICAL_ATTACK_FORMULA,
 				BASE_PHYSICAL_ATTACK_SPEED_FORMULA,

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,
+	protected boolean talk(NPC npc, Lineage2Client conn, L2Character character,
-			L2Character character, String... args) throws L2Exception {
+			String... args) throws L2Exception {
 		String id = null;
 		if (args.length >= 1) {
 			id = args[0];

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!",
+			logger.info("{0}: Service stopped!", serviceClass.getSimpleName());
-					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!",
+			logger.info("{0}: Service restarted!", serviceClass.getSimpleName());
-					serviceClass.getSimpleName());
 			return service;
 		} catch (ServiceStartException e) {
 			logger.error("{0}: Error starting service: {1}",

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

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
+ * {@link DataAccessObject}-{@link DatabaseService Service}. See implementation
- * documentation for more information.
+ * specific documentation for more information.
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */

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,
+	void command(Lineage2Client conn, L2Character character, String command,
-			String command, String... args);
+			String... args);
 
 	/**
 	 * The base interface for Administrator commands

src/main/java/com/l2jserver/service/game/character/CannotSetTargetServiceException.java

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

src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java

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

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(
+		chatService.getGlobalChannel().addMessageListener(globalChatListener);
-				globalChatListener);
 		chatService.getTradeChannel().addMessageListener(tradeChatListener);
 
 		// query client game guard -- if key is invalid, the connection will be

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
+ * Exception thrown if the player trying to send a message is currently banned.
- * banned.
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */
-public class ChatBanActiveChatServiceException extends
+public class ChatBanActiveChatServiceException extends ChatServiceException {
-		ChatServiceException {
 	private static final long serialVersionUID = 1L;
 }

src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java

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

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
+		final Lineage2Client conn = networkService.discover(character.getID());
-				.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
+		final Lineage2Client conn = networkService.discover(character.getID());
-				.getID());
 		try {
 			final NPCController controller = getController(npc);
 			controller.action(npc, conn, character, args);

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<JavaFileObject> list(Location location, String packageName,
+	public synchronized Iterable<JavaFileObject> list(Location location,
-			Set<Kind> kinds, boolean recurse) throws IOException {
+			String packageName, Set<Kind> kinds, boolean recurse)
+			throws IOException {
 		Iterable<JavaFileObject> objects = super.list(location, packageName,
 				kinds, recurse);
 

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

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
  * 

src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java

@@ -135,8 +135,7 @@ 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,
+		return threadService.async(time, unit, new Callable<T>() {
-				new Callable<T>() {
 			@Override
 			public T call() throws Exception {
 				spawn(object, point);
@@ -176,13 +175,12 @@ public class SpawnServiceImpl extends AbstractService implements SpawnService {
 	}
 
 	@Override
-	public <T extends PositionableObject> AsyncFuture<T> unspawn(final T object, long time,
+	public <T extends PositionableObject> AsyncFuture<T> unspawn(
-			TimeUnit unit) {
+			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,
+		return threadService.async(time, unit, new Callable<T>() {
-				new Callable<T>() {
 			@Override
 			public T call() throws Exception {
 				unspawn(object);

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
+ * {@link Skill} {@link Template templates}. The service on startup, loads from
- * database the data and parses them into <tt>com.l2jserver.model.template</tt>
+ * files or from the database the data and parses them into
- * classes. Once they are loaded, templates can be retrieved using any
+ * <tt>com.l2jserver.model.template</tt> classes. Once they are loaded,
- * {@link TemplateID} object created from a {@link TemplateIDProvider}.
+ * templates can be retrieved using any {@link TemplateID} object created from a
+ * {@link TemplateIDProvider}.
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */

src/main/java/com/l2jserver/service/network/NetworkService.java

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

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,
+	private void broadcastUpdate(Lineage2Client conn, L2Character character,
-			L2Character character, Point3D point) {
+			Point3D point) {
 		for (final WorldObject o : worldService
 				.iterable(new KnownListUpdateFilter(character, point))) {
 			broadcast(conn, o);

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
+	private final Injector injector = Guice.createInjector(Stage.PRODUCTION,
-			.createInjector(Stage.PRODUCTION, new GameServerModule());
+			new GameServerModule());
 
 	@Test
 	public void testCachedLoad() throws ServiceStartException {