Merge branch 'master' of bitbucket.org:Major-/apollo.

src/org/apollo/game/login/LoginDispatcher.java

@@ -15,7 +15,7 @@ public final class LoginDispatcher {
 	/**
 	 * A {@link List} of login listeners.
 	 */
-	private List<LoginListener> listeners = new ArrayList<>();
+	private final List<LoginListener> listeners = new ArrayList<>();
 
 	/**
 	 * Dispatches a player to the appropriate login listener.
@@ -23,9 +23,7 @@ public final class LoginDispatcher {
 	 * @param player The player.
 	 */
 	public void dispatch(Player player) {
-		for (LoginListener listener : listeners) {
-			listener.execute(player);
-		}
+		listeners.forEach(listener -> listener.execute(player));
 	}
 
 	/**

src/org/apollo/game/login/LoginListener.java

@@ -15,6 +15,6 @@ public interface LoginListener {
 	 * 
 	 * @param player The player.
 	 */
-	public abstract void execute(Player player);
+	public void execute(Player player);
 
 }

src/org/apollo/game/login/LogoutDispatcher.java

@@ -15,7 +15,7 @@ public final class LogoutDispatcher {
 	/**
 	 * A {@link List} of logout listeners.
 	 */
-	private List<LogoutListener> listeners = new ArrayList<>();
+	private final List<LogoutListener> listeners = new ArrayList<>();
 
 	/**
 	 * Dispatches a player to the appropriate logout listener.
@@ -23,9 +23,7 @@ public final class LogoutDispatcher {
 	 * @param player The player.
 	 */
 	public void dispatch(Player player) {
-		for (LogoutListener listen : listeners) {
-			listen.execute(player);
-		}
+		listeners.forEach(listener -> listener.execute(player));
 	}
 
 	/**

src/org/apollo/game/login/LogoutListener.java

@@ -15,6 +15,6 @@ public interface LogoutListener {
 	 * 
 	 * @param player The player.
 	 */
-	public abstract void execute(Player player);
+	public void execute(Player player);
 
 }

src/org/apollo/game/model/entity/Mob.java

@@ -402,6 +402,15 @@ public abstract class Mob extends Entity {
 			this.index = index;
 		}
 	}
+	
+	/**
+	 * Returns this mobs interacting index.
+	 * 
+	 * @return The interaction index of this mob.
+	 */
+	public int getInteractionIndex() {
+		return index;
+	}
 
 	/**
 	 * Updates this mob's interacting mob.
@@ -410,7 +419,7 @@ public abstract class Mob extends Entity {
 	 */
 	public final void setInteractingMob(Mob mob) {
 		interactingMob = mob;
-		blockSet.add(SynchronizationBlock.createInteractingMobBlock(mob.index));
+		blockSet.add(SynchronizationBlock.createInteractingMobBlock(mob.getInteractionIndex()));
 	}
 
 	/**

src/org/apollo/game/model/entity/Player.java

@@ -355,6 +355,11 @@ public final class Player extends Mob {
 		return EntityType.PLAYER;
 	}
 
+	@Override
+	public int getInteractionIndex() {
+		return getIndex() | 0x8000;
+	}
+
 	/**
 	 * Gets this player's friend chat {@link PrivacyState}.
 	 *