mirror of
				https://github.com/mcMMO-Dev/mcMMO.git
				synced 2025-11-04 02:53:43 +01:00 
			
		
		
		
	Fixed ClassDef error that prevented the server from loading unless
Spout was installed.
This commit is contained in:
		@@ -1,9 +1,7 @@
 | 
			
		||||
package com.gmail.nossr50.runnables;
 | 
			
		||||
 | 
			
		||||
import org.getspout.spoutapi.SpoutManager;
 | 
			
		||||
import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent;
 | 
			
		||||
import org.getspout.spoutapi.player.FileManager;
 | 
			
		||||
import org.getspout.spoutapi.player.SpoutPlayer;
 | 
			
		||||
 | 
			
		||||
import com.gmail.nossr50.mcMMO;
 | 
			
		||||
import com.gmail.nossr50.config.SpoutConfig;
 | 
			
		||||
@@ -36,10 +34,7 @@ public class SpoutStart implements Runnable{
 | 
			
		||||
            FM.addToPreLoginCache(plugin, SpoutStuff.getFiles());
 | 
			
		||||
 | 
			
		||||
            //Handle spout players after a /reload
 | 
			
		||||
            for (SpoutPlayer spoutPlayer : SpoutManager.getPlayerManager().getOnlinePlayers()) {
 | 
			
		||||
                SpoutCraftEnableEvent spoutCraftEnableEvent = new SpoutCraftEnableEvent(spoutPlayer);
 | 
			
		||||
                mcMMO.p.getServer().getPluginManager().callEvent(spoutCraftEnableEvent);
 | 
			
		||||
            }
 | 
			
		||||
            SpoutStuff.reloadSpoutPlayers();
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -16,6 +16,7 @@ import org.bukkit.ChatColor;
 | 
			
		||||
import org.bukkit.Material;
 | 
			
		||||
import org.bukkit.entity.Player;
 | 
			
		||||
import org.getspout.spoutapi.SpoutManager;
 | 
			
		||||
import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent;
 | 
			
		||||
import org.getspout.spoutapi.keyboard.Keyboard;
 | 
			
		||||
import org.getspout.spoutapi.player.SpoutPlayer;
 | 
			
		||||
 | 
			
		||||
@@ -574,4 +575,14 @@ public class SpoutStuff {
 | 
			
		||||
    public static void updateXpBar(Player player) {
 | 
			
		||||
        playerHUDs.get(player).updateXpBarDisplay(Users.getProfile(player).getHUDType(), player); //Is there a reason we can't just do HUDmmo.updateXpBarDisplay?
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Re-enable SpoutCraft for players after a /reload
 | 
			
		||||
     */
 | 
			
		||||
    public static void reloadSpoutPlayers() {
 | 
			
		||||
        for (SpoutPlayer spoutPlayer : SpoutManager.getPlayerManager().getOnlinePlayers()) {
 | 
			
		||||
          SpoutCraftEnableEvent spoutCraftEnableEvent = new SpoutCraftEnableEvent(spoutPlayer);
 | 
			
		||||
          mcMMO.p.getServer().getPluginManager().callEvent(spoutCraftEnableEvent);
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user