Upstream
/
Multiverse-Core
mirror of https://github.com/Multiverse/Multiverse-Core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed Permissions support for now.

This commit is contained in:
Simon Rigby 2011-03-01 16:46:50 +00:00
parent 7d9060879c
commit bee723182a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/onarandombox/MultiVerseCore/MultiVerseCore.java
View File

@ -22,8 +22,8 @@ import org.bukkit.util.config.Configuration;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.Event.Priority; import org.bukkit.event.Event.Priority;
import com.nijikokun.bukkit.Permissions.Permissions; //import com.nijikokun.bukkit.Permissions.Permissions;
import com.nijiko.permissions.PermissionHandler; //import com.nijiko.permissions.PermissionHandler;
import com.onarandombox.MultiVerseCore.commands.*; import com.onarandombox.MultiVerseCore.commands.*;
import com.onarandombox.MultiVerseCore.configuration.defaultConfiguration; import com.onarandombox.MultiVerseCore.configuration.defaultConfiguration;
@ -44,7 +44,7 @@ public class MultiVerseCore extends JavaPlugin {
public static PluginDescriptionFile description; public static PluginDescriptionFile description;
// Permissions Handler // Permissions Handler
public static PermissionHandler Permissions = null; // public static PermissionHandler Permissions = null; // Scrapping Permissions till a stable release is out... this will be handled by isOP() for now.
// Configurations // Configurations
public static Configuration configMV = null; public static Configuration configMV = null;
@ -81,11 +81,12 @@ public class MultiVerseCore extends JavaPlugin {
log.info(logPrefix + "- Version " + this.getDescription().getVersion() + " Enabled"); log.info(logPrefix + "- Version " + this.getDescription().getVersion() + " Enabled");
// Quick check for the Permissions Plugin, if we don't find it here then we'll check the plugin onEnable event. // Quick check for the Permissions Plugin, if we don't find it here then we'll check the plugin onEnable event.
if(getServer().getPluginManager().getPlugin("Permissions")==null){ // TODO: Sort out Permissions Support...
/*if(getServer().getPluginManager().getPlugin("Permissions")==null){
log.info(logPrefix + "- Commands have been DISABLED until Permissions has been found."); log.info(logPrefix + "- Commands have been DISABLED until Permissions has been found.");
} else { } else {
Permissions = com.nijikokun.bukkit.Permissions.Permissions.Security; Permissions = com.nijikokun.bukkit.Permissions.Permissions.Security;
} }*/
// Call the defaultConfiguration class to create the config files if they don't already exist. // Call the defaultConfiguration class to create the config files if they don't already exist.
new defaultConfiguration(this.getDataFolder(), "config.yml"); new defaultConfiguration(this.getDataFolder(), "config.yml");
@ -236,8 +237,12 @@ public class MultiVerseCore extends JavaPlugin {
* onCommand * onCommand
*/ */
public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args) { public boolean onCommand(CommandSender sender, Command command, String commandLabel, String[] args) {
if(Permissions==null || this.isEnabled()==false){ /*if(Permissions==null || this.isEnabled()==false){
return false; return false;
}*/
if(this.isEnabled() == false){
sender.sendMessage("This plugin is Disabled!");
return true;
} }
MVCommandHandler handler = commands.get(command.getName().toLowerCase()); MVCommandHandler handler = commands.get(command.getName().toLowerCase());