Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-09-07 04:48:07 +02:00
Code Issues Projects Releases Wiki Activity

Fixed compilation with Bukkit >= CB1564.

Browse Source 
Sorry, this breaks compatibility with builds < CB1193.
This commit is contained in:
TomyLobo 2011-12-08 02:31:06 +01:00
parent 875b9f326c
commit 5bcac17f1c
2 changed files with 1 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/main/java/com/sk89q/worldguard/bukkit/LegacyConsoleSender.java
View File

@ -1,88 +0,0 @@
package com.sk89q.worldguard.bukkit;
import java.util.Set;
import org.bukkit.Server;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin;
/**
* Console sender.
*
* @author sk89q
*/
class LegacyConsoleSender extends ConsoleCommandSender {
private Server server;
public LegacyConsoleSender(Server server) {
super(server);
this.server = server;
}
public void sendMessage(String message) {
WorldGuardPlugin.logger.info(message);
}
public Server getServer() {
return server;
}
public String getName() {
return "CONSOLE";
}
public boolean isPermissionSet(String name) {
return true;
}
public boolean isPermissionSet(Permission perm) {
return true;
}
public boolean hasPermission(String name) {
return true;
}
public boolean hasPermission(Permission perm) {
return true;
}
public PermissionAttachment addAttachment(Plugin plugin, String name,
boolean value) {
throw new UnsupportedOperationException("Fake legacy console command sender does not support this");
}
public PermissionAttachment addAttachment(Plugin plugin) {
throw new UnsupportedOperationException("Fake legacy console command sender does not support this");
}
public PermissionAttachment addAttachment(Plugin plugin, String name,
boolean value, int ticks) {
throw new UnsupportedOperationException("Fake legacy console command sender does not support this");
}
public PermissionAttachment addAttachment(Plugin plugin, int ticks) {
throw new UnsupportedOperationException("Fake legacy console command sender does not support this");
}
public void removeAttachment(PermissionAttachment attachment) {
throw new UnsupportedOperationException("Fake legacy console command sender does not support this");
}
public void recalculatePermissions() {
}
public Set<PermissionAttachmentInfo> getEffectivePermissions() {
throw new UnsupportedOperationException("Fake legacy console command sender does not support this");
}
public boolean isOp() {
return true;
}
public void setOp(boolean value) {
}
}

7
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java
View File

@ -569,12 +569,7 @@ public CommandSender matchPlayerOrConsole(CommandSender sender, String filter)
if (filter.equalsIgnoreCase("#console")
|| filter.equalsIgnoreCase("*console*")
|| filter.equalsIgnoreCase("!")) {
try {
return getServer().getConsoleSender();
} catch (Throwable t) {
// Legacy support
return new LegacyConsoleSender(getServer());
}
return getServer().getConsoleSender();
}
return matchSinglePlayer(sender, filter);