diff --git a/build.gradle b/build.gradle index 441335f..5a6cc71 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { } group = 'xyz.tronax' -version = '1.1' +version = '1.2' compileJava.options.encoding = "UTF-8" compileTestJava.options.encoding = "UTF-8" diff --git a/src/main/java/xyz/tronax/zalmikadminweapon/listeners/WeaponListener.java b/src/main/java/xyz/tronax/zalmikadminweapon/listeners/WeaponListener.java index 85d0975..f6cbb4e 100644 --- a/src/main/java/xyz/tronax/zalmikadminweapon/listeners/WeaponListener.java +++ b/src/main/java/xyz/tronax/zalmikadminweapon/listeners/WeaponListener.java @@ -4,6 +4,7 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageEvent; @@ -11,11 +12,11 @@ import org.bukkit.event.player.PlayerInteractEntityEvent; public class WeaponListener implements Listener { - @EventHandler + @EventHandler(priority = EventPriority.HIGHEST) public void onDmg(EntityDamageByEntityEvent e) { if(e.getDamager().getType() == EntityType.PLAYER) { Player p = (Player) e.getDamager(); - if(p.getInventory().getItemInMainHand().getItemMeta().getDisplayName() == "§e§lZalmik§c§lAdmin§4§lWeapon") { + if(p.getInventory().getItemInMainHand().getItemMeta().getDisplayName().equals("§e§lZalmik§c§lAdmin§4§lWeapon")) { e.setDamage(69420); } }