minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-09-03 03:32:42 +02:00
Code Issues Releases Wiki Activity

Command perms fix

Browse Source
This commit is contained in:
ementalo
2012-07-17 14:25:49 +01:00
parent a661bce7b3
commit ed00fb9d39
5 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Essentials/src/net/ess3/Essentials.java
View File

@@ -17,23 +17,10 @@
*/ */
package net.ess3; package net.ess3;
import net.ess3.api.*;
import net.ess3.api.server.Player; import net.ess3.api.server.Player;
import net.ess3.api.server.IPlugin; import net.ess3.api.server.IPlugin;
import net.ess3.api.server.IServer; import net.ess3.api.server.IServer;
import net.ess3.api.server.World; import net.ess3.api.server.World;
import net.ess3.backup.Backup;
import net.ess3.commands.EssentialsCommandHandler;
import net.ess3.economy.Economy;
import net.ess3.economy.Trade;
import net.ess3.economy.WorthHolder;
import net.ess3.economy.register.Methods;
import net.ess3.listener.*;
import net.ess3.ranks.RanksStorage;
import net.ess3.settings.SettingsHolder;
import net.ess3.settings.SpawnsHolder;
import net.ess3.user.UserMap;
import net.ess3.utils.ExecuteTimer;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@@ -41,7 +28,6 @@ import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import lombok.Getter; import lombok.Getter;
import lombok.Getter;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.*; import net.ess3.api.*;
import net.ess3.backup.Backup; import net.ess3.backup.Backup;

2
Essentials/src/net/ess3/ItemDb.java
View File

@@ -14,8 +14,6 @@ import net.ess3.api.IItemDb;
import net.ess3.api.IUser; import net.ess3.api.IUser;
import net.ess3.permissions.Permissions; import net.ess3.permissions.Permissions;
import net.ess3.storage.ManagedFile; import net.ess3.storage.ManagedFile;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
public class ItemDb implements IItemDb public class ItemDb implements IItemDb

11
Essentials/src/net/ess3/api/IPermission.java
View File

@@ -1,17 +1,16 @@
package net.ess3.api; package net.ess3.api;
import org.bukkit.command.CommandSender; import net.ess3.api.server.CommandSender;
import org.bukkit.permissions.Permission; import net.ess3.api.server.Permission;
import org.bukkit.permissions.PermissionDefault;
public interface IPermission public interface IPermission
{ {
String getPermission(); String getPermissionName();
boolean isAuthorized(CommandSender sender); boolean isAuthorized(CommandSender sender);
Permission getBukkitPermission(); Permission getPermission();
PermissionDefault getPermissionDefault(); Permission.Default getPermissionDefault();
} }

19
Essentials/src/net/ess3/permissions/AbstractSuperpermsPermission.java
View File

@@ -1,18 +1,19 @@
package net.ess3.permissions; package net.ess3.permissions;
import net.ess3.api.IPermission; import net.ess3.api.IPermission;
import net.ess3.api.server.CommandSender;
import net.ess3.api.server.Permission;
import net.ess3.utils.Util; import net.ess3.utils.Util;
import org.bukkit.command.CommandSender;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault;
public abstract class AbstractSuperpermsPermission implements IPermission public abstract class AbstractSuperpermsPermission implements IPermission
{ {
//todo - sort all this out
protected Permission bukkitPerm; protected Permission bukkitPerm;
@Override @Override
public Permission getBukkitPermission() public Permission getPermission()
{ {
if (bukkitPerm != null) if (bukkitPerm != null)
{ {
@@ -20,7 +21,7 @@ public abstract class AbstractSuperpermsPermission implements IPermission
} }
else else
{ {
return Util.registerPermission(getPermission(), getPermissionDefault()); return null;// Util.registerPermission(getPermission(), getPermissionDefault());
} }
} }
@@ -28,15 +29,17 @@ public abstract class AbstractSuperpermsPermission implements IPermission
* PermissionDefault is OP, if the method is not overwritten. * PermissionDefault is OP, if the method is not overwritten.
* @return * @return
*/ */
@Override @Override
public PermissionDefault getPermissionDefault() public Permission.Default getPermissionDefault()
{ {
return PermissionDefault.OP; return Permission.Default.OP;
} }
@Override @Override
public boolean isAuthorized(final CommandSender sender) public boolean isAuthorized(final CommandSender sender)
{ {
return sender.hasPermission(getBukkitPermission()); return sender.hasPermission(getPermission());
} }
} }

8
Essentials/src/net/ess3/permissions/Permissions.java
View File

@@ -1,6 +1,9 @@
package net.ess3.permissions; package net.ess3.permissions;
import java.util.Locale; import java.util.Locale;
import net.ess3.api.IPermission;
import net.ess3.api.server.CommandSender;
import net.ess3.api.server.Permission;
public enum Permissions implements IPermission public enum Permissions implements IPermission
@@ -106,6 +109,8 @@ public enum Permissions implements IPermission
return permission; return permission;
} }
@Override @Override
public Permission getPermission() public Permission getPermission()
{ {
@@ -119,15 +124,18 @@ public enum Permissions implements IPermission
} }
} }
@Override @Override
public Permission.Default getPermissionDefault() public Permission.Default getPermissionDefault()
{ {
return this.defaultPerm; return this.defaultPerm;
} }
@Override @Override
public boolean isAuthorized(CommandSender sender) public boolean isAuthorized(CommandSender sender)
{ {
return sender.hasPermission(getPermission()); return sender.hasPermission(getPermission());
} }
} }