Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-26 02:58:03 +01:00
Code Issues Projects Releases Wiki Activity

Make Commandgive behavior more similar to Commanditem, fix shutdown spam

Browse Source
This commit is contained in:
vemacs 2015-06-02 17:57:20 -06:00
parent e43ae47a78
commit 1a9954428b
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Essentials/src/com/earth2me/essentials/commands/Commandgive.java
View File

@ -50,12 +50,8 @@ public class Commandgive extends EssentialsCommand {
throw new NotEnoughArgumentsException(); throw new NotEnoughArgumentsException();
} }
MetaItemStack metaStack = new MetaItemStack(stack);
if (!metaStack.canSpawn(ess)) {
throw new Exception(tl("unableToSpawnItem", itemname));
}
if (args.length > 3) { if (args.length > 3) {
MetaItemStack metaStack = new MetaItemStack(stack);
boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantments(); boolean allowUnsafe = ess.getSettings().allowUnsafeEnchantments();
if (allowUnsafe && sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.enchantments.allowunsafe")) { if (allowUnsafe && sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.enchantments.allowunsafe")) {
allowUnsafe = false; allowUnsafe = false;

2
Essentials/src/com/earth2me/essentials/perm/PermissionsHandler.java
View File

@ -96,7 +96,7 @@ public class PermissionsHandler implements IPermissionsHandler {
public void checkPermissions() { public void checkPermissions() {
final PluginManager pluginManager = ess.getServer().getPluginManager(); final PluginManager pluginManager = ess.getServer().getPluginManager();
final Plugin vaultAPI = pluginManager.getPlugin("Vault"); final Plugin vaultAPI = pluginManager.getPlugin("Vault");
if (vaultAPI != null && vaultAPI.isEnabled()) { if (vaultAPI != null && vaultAPI.isEnabled() && !(handler instanceof AbstractVaultHandler)) {
AbstractVaultHandler vaultHandler; AbstractVaultHandler vaultHandler;
String enabledPermsPlugin = ""; String enabledPermsPlugin = "";
List<String> specialCasePlugins = Arrays.asList("PermissionsEx", "GroupManager", List<String> specialCasePlugins = Arrays.asList("PermissionsEx", "GroupManager",