pickup as perm

Author: JRoy

Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java

@@ -1234,7 +1234,7 @@ public void onPlayerPickupItem(final org.bukkit.event.player.PlayerPickupItemEve
             }
             final User user = ess.getUser(event.getPlayer());
             if ((ess.getSettings().getDisableItemPickupWhileAfk() && user.isAfk())
-                || (ess.getSettings().getDisableItemPickupWhileVanished() && user.isVanished())) {
+                || (user.isVanished() && !user.isAuthorizedCached("essentials.vanish.pickup"))) {
                 event.setCancelled(true);
             }
         }
@@ -1246,7 +1246,7 @@ public void onPlayerPickupItem(final org.bukkit.event.entity.EntityPickupItemEve
             if (event.getEntity() instanceof Player) {
                 final User user = ess.getUser((Player) event.getEntity());
                 if ((ess.getSettings().getDisableItemPickupWhileAfk() && user.isAfk())
-                    || (ess.getSettings().getDisableItemPickupWhileVanished() && user.isVanished())) {
+                    || (user.isVanished() && !user.isAuthorizedCached("essentials.vanish.pickup"))) {
                     event.setCancelled(true);
                 }
             }

Essentials/src/main/java/com/earth2me/essentials/ISettings.java

@@ -261,8 +261,6 @@ public interface ISettings extends IConf {
 
     boolean getDisableItemPickupWhileAfk();
 
-    boolean getDisableItemPickupWhileVanished();
-
     EventPriority getRespawnPriority();
 
     EventPriority getSpawnJoinPriority();

Essentials/src/main/java/com/earth2me/essentials/Settings.java

@@ -115,7 +115,6 @@ public class Settings implements net.ess3.api.ISettings {
     private Set<String> noGodWorlds = new HashSet<>();
     private boolean registerBackInListener;
     private boolean disableItemPickupWhileAfk;
-    private boolean disableItemPickupWhileVanished;
     private long teleportInvulnerabilityTime;
     private boolean teleportInvulnerability;
     private long loginAttackDelay;
@@ -804,7 +803,6 @@ public void reloadConfig() {
         teleportInvulnerabilityTime = _getTeleportInvulnerability();
         teleportInvulnerability = _isTeleportInvulnerability();
         disableItemPickupWhileAfk = _getDisableItemPickupWhileAfk();
-        disableItemPickupWhileVanished = _getDisableItemPickupWhileVanished();
         registerBackInListener = _registerBackInListener();
         cancelAfkOnInteract = _cancelAfkOnInteract();
         cancelAfkOnMove = _cancelAfkOnMove();
@@ -1445,15 +1443,6 @@ private boolean _getDisableItemPickupWhileAfk() {
         return config.getBoolean("disable-item-pickup-while-afk", false);
     }
 
-    @Override
-    public boolean getDisableItemPickupWhileVanished() {
-        return disableItemPickupWhileVanished;
-    }
-
-    private boolean _getDisableItemPickupWhileVanished() {
-        return config.getBoolean("disable-item-pickup-while-vanished", true);
-    }
-
     private EventPriority getPriority(final String priority) {
         if ("none".equals(priority)) {
             return null;

Essentials/src/main/resources/config.yml

@@ -516,10 +516,6 @@ freeze-afk-players: false
 # Enable this if you want to prevent people from idling in mob traps.
 disable-item-pickup-while-afk: false
 
-# When a player is vanished, should they be able to pick up items?
-# Picking up items while vanished can reveal the player's presence.
-disable-item-pickup-while-vanished: true
-
 # This setting controls if a player is marked as active upon interaction.
 cancel-afk-on-interact: true
 

Essentials/src/main/resources/plugin.yml

@@ -1374,6 +1374,9 @@ permissions:
     description: Applies invisibility effects to the player when they are in vanish mode
   essentials.vanish.interact:
     description: Allows the bearer to interact with players in vanish mode
+  essentials.vanish.pickup:
+    description: Allows the bearer to pick up items while in vanish mode
+    default: false
   essentials.version:
     description: Allows access to the /version command
   essentials.warp: