feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

I'm sorry but you just shouldn't be using Yeti / Niji perms now.

Browse Source
This commit is contained in:
md_5
2012-06-23 17:52:13 +10:00
parent e645f309a3
commit 8a47e3b2ec
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/de/diddiz/LogBlock/LogBlock.java
View File

@@ -33,8 +33,6 @@ import org.bukkit.entity.Player;
import org.bukkit.permissions.Permission; import org.bukkit.permissions.Permission;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import com.nijiko.permissions.PermissionHandler;
import com.nijikokun.bukkit.Permissions.Permissions;
import de.diddiz.LogBlock.config.Config; import de.diddiz.LogBlock.config.Config;
import de.diddiz.LogBlock.listeners.BanListener; import de.diddiz.LogBlock.listeners.BanListener;
import de.diddiz.LogBlock.listeners.BlockBreakLogging; import de.diddiz.LogBlock.listeners.BlockBreakLogging;
@@ -64,7 +62,6 @@ public class LogBlock extends JavaPlugin
private CommandsHandler commandsHandler; private CommandsHandler commandsHandler;
private Updater updater = null; private Updater updater = null;
private Timer timer = null; private Timer timer = null;
private PermissionHandler permissions = null;
private boolean errorAtLoading = false, noDb = false, connected = true; private boolean errorAtLoading = false, noDb = false, connected = true;
public static LogBlock getInstance() { public static LogBlock getInstance() {
@@ -132,10 +129,6 @@ public class LogBlock extends JavaPlugin
} }
commandsHandler = new CommandsHandler(this); commandsHandler = new CommandsHandler(this);
getCommand("lb").setExecutor(commandsHandler); getCommand("lb").setExecutor(commandsHandler);
if (pm.getPlugin("Permissions") != null) {
permissions = ((Permissions)pm.getPlugin("Permissions")).getHandler();
getLogger().info("[LogBlock] Permissions plugin found.");
} else
getLogger().info("[LogBlock] Permissions plugin not found. Using Bukkit Permissions."); getLogger().info("[LogBlock] Permissions plugin not found. Using Bukkit Permissions.");
if (enableAutoClearLog && autoClearLogDelay > 0) if (enableAutoClearLog && autoClearLogDelay > 0)
getServer().getScheduler().scheduleAsyncRepeatingTask(this, new AutoClearLog(this), 6000, autoClearLogDelay * 60 * 20); getServer().getScheduler().scheduleAsyncRepeatingTask(this, new AutoClearLog(this), 6000, autoClearLogDelay * 60 * 20);
@@ -256,8 +249,6 @@ public class LogBlock extends JavaPlugin
} }
public boolean hasPermission(CommandSender sender, String permission) { public boolean hasPermission(CommandSender sender, String permission) {
if (permissions != null && sender instanceof Player)
return permissions.has((Player)sender, permission);
return sender.hasPermission(permission); return sender.hasPermission(permission);
} }