Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-12-21 00:28:23 +01:00
Code Issues Projects Releases Wiki Activity

Added workaround for #WORLDGUARD-2299, java.lang.IllegalArgumentException: Instant potions cannot be extended.

Browse Source
This commit is contained in:
sk89q 2012-11-11 18:41:18 -08:00
parent 8f409d47d9
commit 8dec32fa6a
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java
View File

@ -152,6 +152,17 @@ public static boolean isWaterPotion(ItemStack item) {
return (item.getDurability() & 0x3F) == 0; return (item.getDurability() & 0x3F) == 0;
} }
/**
* Get just the potion effect bits. This is to work around bugs with potion
* parsing.
*
* @param item item
* @return new bits
*/
public static int getPotionEffectBits(ItemStack item) {
return item.getDurability() & 0x3F;
}
/** /**
* Find a position for the player to stand that is not inside a block. * 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 * Blocks above the player will be iteratively tested until there is

2
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java
View File

@ -824,7 +824,7 @@ public void onBlockDispense(BlockDispenseEvent event) {
if (wcfg.blockPotions.size() > 0) { if (wcfg.blockPotions.size() > 0) {
ItemStack item = event.getItem(); ItemStack item = event.getItem();
if (item.getType() == Material.POTION && !BukkitUtil.isWaterPotion(item)) { if (item.getType() == Material.POTION && !BukkitUtil.isWaterPotion(item)) {
Potion potion = Potion.fromItemStack(item); Potion potion = Potion.fromDamage(BukkitUtil.getPotionEffectBits(item));
for (PotionEffect effect : potion.getEffects()) { for (PotionEffect effect : potion.getEffects()) {
if (potion.isSplash() && wcfg.blockPotions.contains(effect.getType())) { if (potion.isSplash() && wcfg.blockPotions.contains(effect.getType())) {
event.setCancelled(true); event.setCancelled(true);

2
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java
View File

@ -412,7 +412,7 @@ public void onPlayerInteract(PlayerInteractEvent event) {
if (item != null && item.getType() == Material.POTION && !BukkitUtil.isWaterPotion(item)) { if (item != null && item.getType() == Material.POTION && !BukkitUtil.isWaterPotion(item)) {
PotionEffect blockedEffect = null; PotionEffect blockedEffect = null;
Potion potion = Potion.fromItemStack(item); Potion potion = Potion.fromDamage(BukkitUtil.getPotionEffectBits(item));
for (PotionEffect effect : potion.getEffects()) { for (PotionEffect effect : potion.getEffects()) {
if (wcfg.blockPotions.contains(effect.getType())) { if (wcfg.blockPotions.contains(effect.getType())) {
blockedEffect = effect; blockedEffect = effect;