Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2024-11-30 14:33:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
mung3r 2012-12-10 12:56:22 -08:00
commit 2124ad4405
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/craftbukkit-1.4.2-R0.2.jar → lib/craftbukkit-1.4.5-R0.3.jar
View File

Binary file not shown.

2
plugin.yml
View File

@ -1,6 +1,6 @@
name: Vault name: Vault
main: net.milkbowl.vault.Vault main: net.milkbowl.vault.Vault
version: 1.2.21-b${BUILD_NUMBER} version: 1.2.22-b${BUILD_NUMBER}
authors: [cereal, Sleaker, mung3r] authors: [cereal, Sleaker, mung3r]
website: http://dev.bukkit.org/server-mods/vault website: http://dev.bukkit.org/server-mods/vault
load: startup load: startup

4
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.milkbowl.vault</groupId> <groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId> <artifactId>Vault</artifactId>
<version>1.2.21-SNAPSHOT</version> <version>1.2.22-SNAPSHOT</version>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
@ -11,7 +11,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>craftbukkit</artifactId>
<version>1.4.2-R0.2</version> <version>1.4.5-R0.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.hydrox.bukkit.DroxPerms</groupId> <groupId>de.hydrox.bukkit.DroxPerms</groupId>

3
src/net/milkbowl/vault/permission/plugins/Permission_Permissions3.java
View File

@ -23,7 +23,6 @@ import net.milkbowl.vault.permission.Permission;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.craftbukkit.command.ColouredConsoleSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -113,7 +112,7 @@ public class Permission_Permissions3 extends Permission {
@Override @Override
public boolean has(CommandSender sender, String permission) { public boolean has(CommandSender sender, String permission) {
if (sender.isOp() || sender instanceof ColouredConsoleSender) { if (sender.isOp() || !(sender instanceof Player)) {
return true; return true;
} else { } else {
return has(((Player) sender).getWorld().getName(), sender.getName(), permission); return has(((Player) sender).getWorld().getName(), sender.getName(), permission);