From 7dc7fa1f419527e163b5fffc6f003945435db118 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 22 May 2020 17:02:25 +0200 Subject: [PATCH] Removing all crafting possibilitys Signed-off-by: Lixfel --- .../de/steamwar/fightsystem/FightSystem.java | 2 +- .../listener/ArrowPickupListener.java | 19 ----------- .../listener/ExtendedInventoryListener.java | 33 +++++++++++++++++++ 3 files changed, 34 insertions(+), 20 deletions(-) delete mode 100644 FightSystem_Main/src/de/steamwar/fightsystem/listener/ArrowPickupListener.java create mode 100644 FightSystem_Main/src/de/steamwar/fightsystem/listener/ExtendedInventoryListener.java diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java b/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java index bbb6e2d..304b658 100644 --- a/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java +++ b/FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java @@ -64,7 +64,7 @@ public class FightSystem extends JavaPlugin { new TestListener(); new NormalJoinListener(); if(Core.getVersion() > 8) - new ArrowPickupListener(); + new ExtendedInventoryListener(); new WinconditionAllDead(); new WinconditionCaptainDead(); diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/ArrowPickupListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/ArrowPickupListener.java deleted file mode 100644 index 7cbbbd1..0000000 --- a/FightSystem_Main/src/de/steamwar/fightsystem/listener/ArrowPickupListener.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.steamwar.fightsystem.listener; - -import de.steamwar.fightsystem.states.FightState; -import org.bukkit.event.EventHandler; -import org.bukkit.event.player.PlayerPickupArrowEvent; - -import java.util.EnumSet; - -public class ArrowPickupListener extends BasicListener { - - public ArrowPickupListener() { - super(EnumSet.allOf(FightState.class)); - } - - @EventHandler - public void onArrowPickup(PlayerPickupArrowEvent e){ - e.setCancelled(true); - } -} diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/listener/ExtendedInventoryListener.java b/FightSystem_Main/src/de/steamwar/fightsystem/listener/ExtendedInventoryListener.java new file mode 100644 index 0000000..d60d647 --- /dev/null +++ b/FightSystem_Main/src/de/steamwar/fightsystem/listener/ExtendedInventoryListener.java @@ -0,0 +1,33 @@ +package de.steamwar.fightsystem.listener; + +import de.steamwar.fightsystem.states.FightState; +import org.bukkit.Material; +import org.bukkit.event.EventHandler; +import org.bukkit.event.inventory.CraftItemEvent; +import org.bukkit.event.inventory.FurnaceSmeltEvent; +import org.bukkit.event.player.PlayerPickupArrowEvent; +import org.bukkit.inventory.ItemStack; + +import java.util.EnumSet; + +public class ExtendedInventoryListener extends BasicListener { + + public ExtendedInventoryListener() { + super(EnumSet.allOf(FightState.class)); + } + + @EventHandler + public void onArrowPickup(PlayerPickupArrowEvent e){ + e.setCancelled(true); + } + + @EventHandler + public void onCrafting(CraftItemEvent e){ + e.setCancelled(true); + } + + @EventHandler + public void onFurnace(FurnaceSmeltEvent e){ + e.setResult(new ItemStack(Material.AIR)); + } +}