*CLEANUP* - mcSelfListener.java & mcSpoutInputListener.java

This commit is contained in:
GJ 2012-03-11 01:19:19 -05:00
parent 4359dc764f
commit def65282dd
2 changed files with 55 additions and 46 deletions

View File

@ -9,16 +9,24 @@ import com.gmail.nossr50.events.McMMOPlayerXpGainEvent;
* Listener for listening to our own events, only really useful for catching errors * Listener for listening to our own events, only really useful for catching errors
*/ */
public class mcSelfListener implements Listener { public class mcSelfListener implements Listener {
@EventHandler
public void onPlayerXpGain(McMMOPlayerXpGainEvent event) { /**
int xp = event.getXpGained(); * Monitor internal XP gain events.
if(xp < 0) { *
try { * @param event The event to watch
throw new Exception("Gained negative XP!"); */
} catch (Exception e) { @EventHandler
System.out.println(e.getMessage()); public void onPlayerXpGain(McMMOPlayerXpGainEvent event) {
e.printStackTrace(); int xp = event.getXpGained();
}
} if(xp < 0) {
} try {
throw new Exception("Gained negative XP!");
}
catch (Exception e) {
System.out.println(e.getMessage());
e.printStackTrace();
}
}
}
} }

View File

@ -11,37 +11,38 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.popups.PopupMMO; import com.gmail.nossr50.datatypes.popups.PopupMMO;
import com.gmail.nossr50.spout.SpoutStuff; import com.gmail.nossr50.spout.SpoutStuff;
public class mcSpoutInputListener implements Listener public class mcSpoutInputListener implements Listener {
{ private mcMMO plugin;
mcMMO plugin = null;
public mcSpoutInputListener(mcMMO plugin) {
public mcSpoutInputListener(mcMMO pluginx) this.plugin = plugin;
{ }
plugin = pluginx;
} /**
* Monitor Spout KeyPressed events.
@EventHandler *
public void onKeyPressedEvent(KeyPressedEvent event) * @param event The event to watch
{ */
if(!event.getPlayer().isSpoutCraftEnabled() || event.getPlayer().getMainScreen().getActivePopup() != null) @EventHandler
return; public void onKeyPressedEvent(KeyPressedEvent event) {
if(event.getScreenType() != ScreenType.GAME_SCREEN) SpoutPlayer sPlayer = event.getPlayer();
return;
if (!sPlayer.isSpoutCraftEnabled() || sPlayer.getMainScreen().getActivePopup() != null || event.getScreenType() != ScreenType.GAME_SCREEN) {
SpoutPlayer sPlayer = event.getPlayer(); return;
}
if(event.getKey() == SpoutStuff.keypress)
{ if (event.getKey() == SpoutStuff.keypress) {
if(!SpoutStuff.playerScreens.containsKey(sPlayer)) if (!SpoutStuff.playerScreens.containsKey(sPlayer)) {
{ PopupMMO mmoPop = new PopupMMO(sPlayer, Users.getProfile(sPlayer), plugin);
PopupMMO mmoPop = new PopupMMO(sPlayer, Users.getProfile(sPlayer), plugin);
SpoutStuff.playerScreens.put(sPlayer, mmoPop); SpoutStuff.playerScreens.put(sPlayer, mmoPop);
sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer)); sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));
sPlayer.getMainScreen().setDirty(true); sPlayer.getMainScreen().setDirty(true);
} else { }
sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer)); else {
sPlayer.getMainScreen().setDirty(true); sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));
} sPlayer.getMainScreen().setDirty(true);
} }
} }
} }
}