From 95fa6883061851afc33424e5ecdc1990fd3169c1 Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Fri, 25 Jan 2013 00:51:45 -0500
Subject: [PATCH] More cleanup.

---
 .../com/gmail/nossr50/spout/SpoutListener.java     | 14 ++++++++------
 .../java/com/gmail/nossr50/spout/SpoutStuff.java   | 10 ++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/spout/SpoutListener.java b/src/main/java/com/gmail/nossr50/spout/SpoutListener.java
index fcc291ed3..c48b40bf3 100644
--- a/src/main/java/com/gmail/nossr50/spout/SpoutListener.java
+++ b/src/main/java/com/gmail/nossr50/spout/SpoutListener.java
@@ -1,6 +1,7 @@
 package com.gmail.nossr50.spout;
 
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.getspout.spoutapi.event.input.KeyPressedEvent;
 import org.getspout.spoutapi.event.screen.ButtonClickEvent;
@@ -19,19 +20,20 @@ import com.gmail.nossr50.spout.popups.Menu;
 import com.gmail.nossr50.util.Users;
 
 public class SpoutListener implements Listener {
+
     /**
      * Monitor SpoutCraftEnable events.
      *
      * @param event The event to watch
      */
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onSpoutCraftEnable(SpoutCraftEnableEvent event) {
         SpoutPlayer spoutPlayer = event.getPlayer();
         McMMOPlayer mcMMOPlayer = Users.getPlayer(spoutPlayer);
         PlayerProfile profile = mcMMOPlayer.getProfile();
 
         //TODO: Add custom titles based on skills
-        if (SpoutConfig.getInstance().getShowPowerLevel()) {
+        if (SpoutStuff.showPowerLevel) {
             spoutPlayer.setTitle(LocaleLoader.getString("Spout.Title", new Object[] {spoutPlayer.getName(), mcMMOPlayer.getPowerLevel()}));
         }
 
@@ -43,7 +45,7 @@ public class SpoutListener implements Listener {
      *
      * @param event The event to watch
      */
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onButtonClick(ButtonClickEvent event) {
         Button button = event.getButton();
 
@@ -57,7 +59,7 @@ public class SpoutListener implements Listener {
      *
      * @param event The event to watch
      */
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onScreenClose(ScreenCloseEvent event) {
         if (event.getScreen() instanceof Menu) {
             SpoutPlayer spoutPlayer = event.getPlayer();
@@ -72,7 +74,7 @@ public class SpoutListener implements Listener {
      *
      * @param event The event to watch
      */
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onKeyPressedEvent(KeyPressedEvent event) {
         SpoutPlayer spoutPlayer = event.getPlayer();
 
@@ -80,7 +82,7 @@ public class SpoutListener implements Listener {
             return;
         }
 
-        if (event.getKey() == SpoutStuff.keypress) {
+        if (event.getKey() == SpoutStuff.menuKey) {
             SpoutHud spoutHud = Users.getProfile(spoutPlayer).getSpoutHud();
 
             if (!spoutHud.isMenuOpened()) {
diff --git a/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java b/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java
index e39d31ac4..67ac9e2ac 100644
--- a/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java
+++ b/src/main/java/com/gmail/nossr50/spout/SpoutStuff.java
@@ -37,8 +37,10 @@ public class SpoutStuff {
     public final static String hudRetroDirectory = hudDirectory + "Retro" + File.separator;
     public final static String soundDirectory = spoutDirectory + "Sound" + File.separator;
 
+    public static boolean showPowerLevel = SpoutConfig.getInstance().getShowPowerLevel();
+
     private final static SpoutListener spoutListener = new SpoutListener();
-    public static Keyboard keypress;
+    public static Keyboard menuKey;
 
     /**
      * Write file to disk.
@@ -163,13 +165,13 @@ public class SpoutStuff {
 
         for (Keyboard x : Keyboard.values()) {
             if (x.toString().equalsIgnoreCase(temp)) {
-                keypress = x;
+                menuKey = x;
             }
         }
 
-        if (keypress == null) {
+        if (menuKey == null) {
             System.out.println("Invalid KEY for Menu.Key, using KEY_M");
-            keypress = Keyboard.KEY_M;
+            menuKey = Keyboard.KEY_M;
         }
     }