From e26ed8c8a121f5516f21fdd69d8f199727042b93 Mon Sep 17 00:00:00 2001 From: Ryley Kimmel Date: Thu, 26 Feb 2015 00:03:17 -0500 Subject: [PATCH 1/2] Login/Logout listener formatting. --- src/org/apollo/game/login/LoginDispatcher.java | 6 ++---- src/org/apollo/game/login/LoginListener.java | 2 +- src/org/apollo/game/login/LogoutDispatcher.java | 6 ++---- src/org/apollo/game/login/LogoutListener.java | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/org/apollo/game/login/LoginDispatcher.java b/src/org/apollo/game/login/LoginDispatcher.java index 878fd9c8..98968c27 100644 --- a/src/org/apollo/game/login/LoginDispatcher.java +++ b/src/org/apollo/game/login/LoginDispatcher.java @@ -15,7 +15,7 @@ public final class LoginDispatcher { /** * A {@link List} of login listeners. */ - private List listeners = new ArrayList<>(); + private final List 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)); } /** diff --git a/src/org/apollo/game/login/LoginListener.java b/src/org/apollo/game/login/LoginListener.java index 5fcc2ea4..8530178d 100644 --- a/src/org/apollo/game/login/LoginListener.java +++ b/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); } \ No newline at end of file diff --git a/src/org/apollo/game/login/LogoutDispatcher.java b/src/org/apollo/game/login/LogoutDispatcher.java index c7a5e3f8..cc3895eb 100644 --- a/src/org/apollo/game/login/LogoutDispatcher.java +++ b/src/org/apollo/game/login/LogoutDispatcher.java @@ -15,7 +15,7 @@ public final class LogoutDispatcher { /** * A {@link List} of logout listeners. */ - private List listeners = new ArrayList<>(); + private final List 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)); } /** diff --git a/src/org/apollo/game/login/LogoutListener.java b/src/org/apollo/game/login/LogoutListener.java index 8a67f5ee..65aa0dfb 100644 --- a/src/org/apollo/game/login/LogoutListener.java +++ b/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); } \ No newline at end of file From e2d150b6ca8e8d642d2a185c89b3eefef94da27a Mon Sep 17 00:00:00 2001 From: Ryley Kimmel Date: Thu, 26 Feb 2015 01:01:50 -0500 Subject: [PATCH 2/2] Fix an issue where the mob interaction index was set incorrectly for players. --- src/org/apollo/game/model/entity/Mob.java | 11 ++++++++++- src/org/apollo/game/model/entity/Player.java | 5 +++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/org/apollo/game/model/entity/Mob.java b/src/org/apollo/game/model/entity/Mob.java index 9240dc8e..8bdf5f6f 100644 --- a/src/org/apollo/game/model/entity/Mob.java +++ b/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())); } /** diff --git a/src/org/apollo/game/model/entity/Player.java b/src/org/apollo/game/model/entity/Player.java index 2367991e..c2499eb0 100644 --- a/src/org/apollo/game/model/entity/Player.java +++ b/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}. *