Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-22 02:25:42 +01:00
Code Issues Projects Releases Wiki Activity

Ignore placing of Water Bottle, see #2096

Browse Source
This commit is contained in:
PikaMug 2023-05-04 23:04:11 -04:00
parent 3d8179f55d
commit 85d0f035a6
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/main/java/me/blackvein/quests/listeners/ItemListener.java
View File

@ -12,10 +12,10 @@
package me.blackvein.quests.listeners; package me.blackvein.quests.listeners;
import me.blackvein.quests.quests.IQuest;
import me.blackvein.quests.player.IQuester;
import me.blackvein.quests.Quests; import me.blackvein.quests.Quests;
import me.blackvein.quests.enums.ObjectiveType; import me.blackvein.quests.enums.ObjectiveType;
import me.blackvein.quests.player.IQuester;
import me.blackvein.quests.quests.IQuest;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -28,6 +28,8 @@ import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.inventory.InventoryType.SlotType; import org.bukkit.event.inventory.InventoryType.SlotType;
import org.bukkit.event.player.PlayerItemConsumeEvent; import org.bukkit.event.player.PlayerItemConsumeEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.potion.PotionType;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@ -163,7 +165,7 @@ public class ItemListener implements Listener {
} }
public boolean isAllowedBrewingAction(final InventoryClickEvent event) { public boolean isAllowedBrewingAction(final InventoryClickEvent event) {
if (event.getCursor() != null && event.getCursor().getType().equals(Material.GLASS_BOTTLE)) { if (event.getCursor() != null && isWaterBottle(event.getCursor())) {
return true; return true;
} }
final int slot = event.getRawSlot(); final int slot = event.getRawSlot();
@ -183,6 +185,22 @@ public class ItemListener implements Listener {
} }
return true; return true;
} }
public boolean isWaterBottle(ItemStack item) {
if (item == null) {
return false;
}
if (item.getType().equals(Material.POTION)) {
PotionMeta meta = (PotionMeta) item.getItemMeta();
if (meta == null) {
return false;
}
if (meta.getBasePotionData().getType().equals(PotionType.WATER)) {
return true;
}
}
return false;
}
@EventHandler @EventHandler
public void onEnchantItem(final EnchantItemEvent event) { public void onEnchantItem(final EnchantItemEvent event) {