diff --git a/pom.xml b/pom.xml index d0e8b9b..32925fd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.garsooon arenafighter - 1.1.0 + 1.1.1 jar diff --git a/src/main/java/org/garsooon/arenafighter/Economy/Methods.java b/src/main/java/org/garsooon/arenafighter/Economy/Methods.java index 2bba75b..3d42334 100644 --- a/src/main/java/org/garsooon/arenafighter/Economy/Methods.java +++ b/src/main/java/org/garsooon/arenafighter/Economy/Methods.java @@ -30,7 +30,7 @@ public class Methods { */ private static void _init() { addMethod("Essentials", new org.garsooon.arenafighter.Economy.methods.EE17()); - addMethod("ZCore", new org.garsooon.arenafighter.Economy.methods.ZCoreEco()); +// addMethod("ZCore", new org.garsooon.arenafighter.Economy.methods.ZCoreEco()); Dependencies.add("MultiCurrency"); // Optional/future support } diff --git a/src/main/java/org/garsooon/arenafighter/Listeners/BowListener.java b/src/main/java/org/garsooon/arenafighter/Listeners/BowListener.java index b437da2..635d517 100644 --- a/src/main/java/org/garsooon/arenafighter/Listeners/BowListener.java +++ b/src/main/java/org/garsooon/arenafighter/Listeners/BowListener.java @@ -5,6 +5,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; import org.garsooon.arenafighter.Arena.ArenaFighter; @@ -21,11 +22,10 @@ public BowListener(ArenaFighter plugin) { @EventHandler public void onPlayerInteract(PlayerInteractEvent event) { Player player = event.getPlayer(); - if (plugin.isBowDisabled() + if (plugin.getFightManager().isInFight(player) && player.getItemInHand() != null && player.getItemInHand().getType() == Material.BOW - && event.getAction().toString().contains("RIGHT")) - { + && (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)) { event.setCancelled(true); player.sendMessage(ChatColor.RED + "Bows are currently disabled in Arena-Fighter!"); } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 2b4c5b3..9e506d0 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: ArenaFighter -version: 1.1.0 +version: 1.1.1 description: A plugin that allows players to fight in arenas and teleports them back after fights conclude author: Garsooon main: org.garsooon.arenafighter.Arena.ArenaFighter