Move EventContext functionality into Event, remove EventContext, add LogoutEvent support.

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

@@ -20,6 +20,7 @@ import org.apollo.game.model.Position;
 import org.apollo.game.model.World;
 import org.apollo.game.model.area.Sector;
 import org.apollo.game.model.event.impl.LoginEvent;
+import org.apollo.game.model.event.impl.LogoutEvent;
 import org.apollo.game.model.inter.InterfaceConstants;
 import org.apollo.game.model.inter.InterfaceListener;
 import org.apollo.game.model.inter.InterfaceSet;
@@ -600,7 +601,9 @@ public final class Player extends Mob {
 	 * Logs the player out, if possible.
 	 */
 	public void logout() {
-		send(new LogoutMessage());
+		if (World.getWorld().submit(new LogoutEvent(this))) {
+			send(new LogoutMessage());
+		}
 	}
 
 	/**

src/org/apollo/game/model/event/Event.java

@@ -6,5 +6,26 @@ package org.apollo.game.model.event;
  * @author Major
  */
 public abstract class Event {
+	
+	/**
+	 * Indicates whether or not the Event chain has been terminated.
+	 */
+	private boolean terminated;
 
+	/**
+	 * Terminates the Event chain.
+	 */
+	public final void terminate() {
+		terminated = true;
+	}
+
+	/**
+	 * Returns whether or not the Event chain has been terminated.
+	 * 
+	 * @return {@code true} if the Event chain has been terminated, otherwise {@code false}.
+	 */
+	public final boolean terminated() {
+		return terminated;
+	}
+	
 }

src/org/apollo/game/model/event/EventContext.java

@@ -1,31 +0,0 @@
-package org.apollo.game.model.event;
-
-/**
- * The context of an {@link Event}.
- *
- * @author Major
- */
-final class EventContext {
-
-	/**
-	 * Indicates whether or not the Event chain has been terminated.
-	 */
-	private boolean terminated;
-
-	/**
-	 * Terminates the Event chain.
-	 */
-	public void terminateEvent() {
-		terminated = true;
-	}
-
-	/**
-	 * Returns whether or not the Event chain has been terminated.
-	 * 
-	 * @return {@code true} if the Event chain has been terminated, otherwise {@code false}.
-	 */
-	public boolean terminated() {
-		return terminated;
-	}
-
-}

src/org/apollo/game/model/event/EventListener.java

@@ -14,8 +14,7 @@ public interface EventListener<E> {
 	 * Handles the {@link Event} that occurred.
 	 * 
 	 * @param event The Event.
-	 * @param context The {@link EventContext}.
 	 */
-	public void handle(E event, EventContext context);
+	public void handle(E event);
 
 }

src/org/apollo/game/model/event/EventListenerChain.java

@@ -48,16 +48,15 @@ final class EventListenerChain<E extends Event> {
 	 * @return {@code true} if the Event should continue on with its outcome, {@code false} if not.
 	 */
 	public boolean notify(E event) {
-		EventContext context = new EventContext();
 		for (EventListener<E> listener : listeners) {
-			listener.handle(event, context);
+			listener.handle(event);
 
-			if (context.terminated()) {
+			if (event.terminated()) {
 				return false;
 			}
 		}
 
-		return false;
+		return true;
 	}
 
 	@Override