Fixes WORLDGUARD-2281, NPE on Water Potion Drinking

This resolves the issue where WorldGuard would throw a NullPointerException when a player drank a potion of water while potion blocking was enabled.
EngineHub · Nov 6, 2012 · 3734c07 · 3734c07
1 parent b1a419f
commit 3734c07
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 56 deletions.
diff --git a/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java b/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java
@@ -31,6 +31,8 @@
 import org.bukkit.block.Block;
 import org.bukkit.entity.*;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.Potion;
+import org.bukkit.potion.PotionType;
 
 import java.util.List;
 
@@ -143,6 +145,16 @@ public static boolean isBlockWater(World world, int ox, int oy, int oz) {
         return id == 8 || id == 9;
     }
 
+    /*
+     * Checks if the given potion is a vial of water
+     *
+     * @param potion
+     */
+    public static boolean isWaterPotion(Potion potion) {
+
+        return potion.getType() == PotionType.WATER;
+    }
+
     /**
      * Find a position for the player to stand that is not inside a block.
      * Blocks above the player will be iteratively tested until there is

diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
@@ -18,17 +18,18 @@
  */
 package com.sk89q.worldguard.bukkit;
 
-import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
-
-import java.util.Iterator;
-import java.util.Set;
+import com.sk89q.worldedit.Vector;
 import com.sk89q.worldedit.blocks.BlockID;
+import com.sk89q.worldedit.blocks.BlockType;
 import com.sk89q.worldedit.blocks.ItemID;
-import org.bukkit.ChatColor;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.blacklist.events.*;
+import com.sk89q.worldguard.bukkit.FlagStateManager.PlayerFlagState;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Item;
@@ -38,39 +39,16 @@
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
-import org.bukkit.event.player.PlayerBedEnterEvent;
-import org.bukkit.event.player.PlayerBucketEmptyEvent;
-import org.bukkit.event.player.PlayerBucketFillEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerDropItemEvent;
-import org.bukkit.event.player.PlayerGameModeChangeEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerItemHeldEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.event.player.PlayerPickupItemEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.player.PlayerRespawnEvent;
+import org.bukkit.event.player.*;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.potion.Potion;
 import org.bukkit.potion.PotionEffect;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BlockType;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockInteractBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
-import com.sk89q.worldguard.bukkit.FlagStateManager.PlayerFlagState;
-import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+
+import java.util.Iterator;
+import java.util.Set;
+
+import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
 
 /**
  * Handles all events thrown in relation to a player.
@@ -429,30 +407,32 @@ public void onPlayerInteract(PlayerInteractEvent event) {
                 PotionEffect blockedEffect = null;
 
                 Potion potion = Potion.fromItemStack(item);
-                for (PotionEffect effect : potion.getEffects()) {
-                    if (wcfg.blockPotions.contains(effect.getType())) {
-                        blockedEffect = effect;
-                        break;
+                if (!BukkitUtil.isWaterPotion(potion)) {
+                    for (PotionEffect effect : potion.getEffects()) {
+                        if (wcfg.blockPotions.contains(effect.getType())) {
+                            blockedEffect = effect;
+                            break;
+                        }
                     }
-                }
 
-                if (blockedEffect != null) {
-                    if (plugin.hasPermission(player, "worldguard.override.potions")) {
-                        if (potion.isSplash() && wcfg.blockPotionsAlways) {
-                            player.sendMessage(ChatColor.RED + "Sorry, potions with " +
-                                    blockedEffect.getType().getName() +
-                                    " can't be thrown, even if you have a permission to " +
-                                    "bypass it, due to limitations (and because overly-reliable potion blocking is on).");
+                    if (blockedEffect != null) {
+                        if (plugin.hasPermission(player, "worldguard.override.potions")) {
+                            if (potion.isSplash() && wcfg.blockPotionsAlways) {
+                                player.sendMessage(ChatColor.RED + "Sorry, potions with " +
+                                        blockedEffect.getType().getName() + " can't be thrown, " +
+                                        "even if you have a permission to bypass it, " +
+                                        "due to limitations (and because overly-reliable potion blocking is on).");
+                                event.setUseItemInHand(Result.DENY);
+                                return;
+                            }
+                        } else {
+                            player.sendMessage(ChatColor.RED + "Sorry, potions with "
+                                    + blockedEffect.getType().getName() + " are presently disabled.");
                             event.setUseItemInHand(Result.DENY);
                             return;
                         }
-                    } else {
-                        player.sendMessage(ChatColor.RED + "Sorry, potions with "
-                                + blockedEffect.getType().getName() + " are presently disabled.");
-                        event.setUseItemInHand(Result.DENY);
-                        return;
-                    }
 
+                    }
                 }
             }
         }