Skip to content

Commit

Permalink
Don't show vault errors if there's a fallback
Browse files Browse the repository at this point in the history
Shut up, ya errors
  • Loading branch information
mcmonkey4eva committed Nov 13, 2014
1 parent edcb207 commit 2a707b8
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
Expand Up @@ -666,7 +666,8 @@ public String getAttribute(Attribute attribute) {
.getAttribute(attribute.fulfill(1));

} else {
dB.echoError("No economy loaded! Have you installed Vault and a compatible economy plugin?");
if (!attribute.hasAlternative())
dB.echoError("No economy loaded! Have you installed Vault and a compatible economy plugin?");
return null;
}
}
Expand Down Expand Up @@ -1005,7 +1006,8 @@ else if (attribute.startsWith("uuid") && !isOnline())
// -->
if (attribute.startsWith("groups")) {
if (Depends.permissions == null) {
dB.echoError("No permission system loaded! Have you installed Vault and a compatible permissions plugin?");
if (!attribute.hasAlternative())
dB.echoError("No permission system loaded! Have you installed Vault and a compatible permissions plugin?");
return null;
}
dList list = new dList();
Expand All @@ -1025,7 +1027,8 @@ else if (attribute.startsWith("uuid") && !isOnline())
// -->
if (attribute.startsWith("in_group")) {
if (Depends.permissions == null) {
dB.echoError("No permission system loaded! Have you installed Vault and a compatible permissions plugin?");
if (!attribute.hasAlternative())
dB.echoError("No permission system loaded! Have you installed Vault and a compatible permissions plugin?");
return null;
}

Expand Down Expand Up @@ -1080,7 +1083,8 @@ else if (isOnline())
String permission = attribute.getContext(1);

if (Depends.permissions == null) {
dB.echoError("No permission system loaded! Have you installed Vault and a compatible permissions plugin?");
if (!attribute.hasAlternative())
dB.echoError("No permission system loaded! Have you installed Vault and a compatible permissions plugin?");
return null;
}

Expand Down

0 comments on commit 2a707b8

Please sign in to comment.