mirror of
				https://github.com/mcMMO-Dev/mcMMO.git
				synced 2025-11-03 18:43:43 +01:00 
			
		
		
		
	*CLEANUP* - mcSelfListener.java & mcSpoutInputListener.java
This commit is contained in:
		@@ -9,13 +9,21 @@ 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 {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Monitor internal XP gain events.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @param event The event to watch
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
    @EventHandler
 | 
					    @EventHandler
 | 
				
			||||||
    public void onPlayerXpGain(McMMOPlayerXpGainEvent event) {
 | 
					    public void onPlayerXpGain(McMMOPlayerXpGainEvent event) {
 | 
				
			||||||
        int xp = event.getXpGained();
 | 
					        int xp = event.getXpGained();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if(xp < 0) {
 | 
					        if(xp < 0) {
 | 
				
			||||||
            try {
 | 
					            try {
 | 
				
			||||||
                throw new Exception("Gained negative XP!");
 | 
					                throw new Exception("Gained negative XP!");
 | 
				
			||||||
			} catch (Exception e) {
 | 
					            }
 | 
				
			||||||
 | 
					            catch (Exception e) {
 | 
				
			||||||
                System.out.println(e.getMessage());
 | 
					                System.out.println(e.getMessage());
 | 
				
			||||||
                e.printStackTrace();
 | 
					                e.printStackTrace();
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,34 +11,35 @@ 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 pluginx)
 | 
					    public mcSpoutInputListener(mcMMO plugin) {
 | 
				
			||||||
	{
 | 
					        this.plugin = plugin;
 | 
				
			||||||
		plugin = pluginx;
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Monitor Spout KeyPressed events.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @param event The event to watch
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
    @EventHandler
 | 
					    @EventHandler
 | 
				
			||||||
	public void onKeyPressedEvent(KeyPressedEvent event) 
 | 
					    public void onKeyPressedEvent(KeyPressedEvent event) {
 | 
				
			||||||
	{
 | 
					 | 
				
			||||||
		if(!event.getPlayer().isSpoutCraftEnabled() || event.getPlayer().getMainScreen().getActivePopup() != null)
 | 
					 | 
				
			||||||
			return;
 | 
					 | 
				
			||||||
		if(event.getScreenType() != ScreenType.GAME_SCREEN)
 | 
					 | 
				
			||||||
			return;
 | 
					 | 
				
			||||||
		
 | 
					 | 
				
			||||||
        SpoutPlayer sPlayer = event.getPlayer();
 | 
					        SpoutPlayer sPlayer = event.getPlayer();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if(event.getKey() == SpoutStuff.keypress)
 | 
					        if (!sPlayer.isSpoutCraftEnabled() || sPlayer.getMainScreen().getActivePopup() != null || event.getScreenType() != ScreenType.GAME_SCREEN) {
 | 
				
			||||||
		{
 | 
					            return;
 | 
				
			||||||
			if(!SpoutStuff.playerScreens.containsKey(sPlayer))
 | 
					        }
 | 
				
			||||||
			{
 | 
					
 | 
				
			||||||
 | 
					        if (event.getKey() == SpoutStuff.keypress) {
 | 
				
			||||||
 | 
					            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 {
 | 
					            }
 | 
				
			||||||
 | 
					            else {
 | 
				
			||||||
                sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));
 | 
					                sPlayer.getMainScreen().attachPopupScreen(SpoutStuff.playerScreens.get(sPlayer));
 | 
				
			||||||
                sPlayer.getMainScreen().setDirty(true);
 | 
					                sPlayer.getMainScreen().setDirty(true);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user