Remove enchant from mino head

zelytra · Aug 26, 2021 · 076c401 · 076c401
1 parent fed737a
commit 076c401
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 9 deletions.
diff --git a/src/main/java/fr/zelytra/daedalus/events/EventsManager.java b/src/main/java/fr/zelytra/daedalus/events/EventsManager.java
@@ -71,6 +71,7 @@ public static void registerEvents(Daedalus pl) {
         pm.registerEvents(new AresWarBanner(), pl);
         pm.registerEvents(new ArtemisHorn(), pl);
         pm.registerEvents(new PoseidonCoche(), pl);
+        pm.registerEvents(new MinotaurHead(), pl);
 
 
         /*Gods Handlers*/

diff --git a/...in/java/fr/zelytra/daedalus/events/running/environnement/items/listener/MinotaurHead.java b/...in/java/fr/zelytra/daedalus/events/running/environnement/items/listener/MinotaurHead.java
@@ -0,0 +1,28 @@
+package fr.zelytra.daedalus.events.running.environnement.items.listener;
+
+import fr.zelytra.daedalus.Daedalus;
+import fr.zelytra.daedalus.managers.items.CustomItemStack;
+import fr.zelytra.daedalus.managers.items.CustomMaterial;
+import org.bukkit.GameMode;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryType;
+
+public class MinotaurHead implements Listener {
+
+    @EventHandler
+    public void onHeadRemove(InventoryClickEvent e) {
+        if (!Daedalus.getInstance().getGameManager().isRunning()) return;
+
+        if (e.getWhoClicked().getGameMode() != GameMode.SURVIVAL) return;
+
+        if (e.getInventory().getType() != InventoryType.CRAFTING) return;
+
+        if (e.getCurrentItem() == null) return;
+
+        if (CustomItemStack.getCustomMaterial(e.getCurrentItem()) == CustomMaterial.MINOTAUR_HEAD)
+            e.setCancelled(true);
+
+    }
+}
diff --git a/.../java/fr/zelytra/daedalus/events/running/players/DeathHandler/listener/DeathListener.java b/.../java/fr/zelytra/daedalus/events/running/players/DeathHandler/listener/DeathListener.java
@@ -57,7 +57,7 @@ public void onCustomDeath(EntityDamageEvent e) {
                 }
 
             }
-            if (e.getCause() == EntityDamageEvent.DamageCause.FALL) { //Kill by falling
+            if (e.getCause() == EntityDamageEvent.DamageCause.FALL && e.getEntity().getLastDamageCause() != null) { //Kill by falling
                 Player killer = (Player) ((EntityDamageByEntityEvent) e.getEntity().getLastDamageCause()).getDamager();
                 killByAMino = daedalus.getGameManager().getFactionManager().getFactionOf(killer).getGodsEnum() == GodsEnum.MINOTAURE; //Tuer par un mino
             }

diff --git a/...elytra/daedalus/events/running/players/DeathHandler/listener/DefinitiveDeathListener.java b/...elytra/daedalus/events/running/players/DeathHandler/listener/DefinitiveDeathListener.java
@@ -120,6 +120,10 @@ private void deathFX(EntityDamageEvent e) {
             return;
 
         } else if (e.getCause() == EntityDamageEvent.DamageCause.FALL) {
+            if (e.getEntity().getLastDamageCause() == null) {
+                Bukkit.broadcastMessage(faction.getType().getPrefix() + e.getEntity().getName() + GameSettings.LANG.textOf("death.definitive"));
+                return;
+            }
             damageEvent = (EntityDamageByEntityEvent) e.getEntity().getLastDamageCause();
 
             Bukkit.broadcastMessage(faction.getType().getPrefix() + e.getEntity().getName() +

diff --git a/...r/zelytra/daedalus/events/running/players/DeathHandler/listener/PartielDeathListener.java b/...r/zelytra/daedalus/events/running/players/DeathHandler/listener/PartielDeathListener.java
@@ -120,6 +120,11 @@ private void respawnFX(EntityDamageEvent e) {
             return;
 
         } else if (e.getCause() == EntityDamageEvent.DamageCause.FALL) {
+            if (e.getEntity().getLastDamageCause() == null) {
+                Bukkit.broadcastMessage(faction.getType().getPrefix() + e.getEntity().getName() + GameSettings.LANG.textOf("death.default"));
+                return;
+            }
+
             damageEvent = (EntityDamageByEntityEvent) e.getEntity().getLastDamageCause();
 
             Bukkit.broadcastMessage(faction.getType().getPrefix() + e.getEntity().getName() +

diff --git a/src/main/java/fr/zelytra/daedalus/managers/gods/list/Minotaure.java b/src/main/java/fr/zelytra/daedalus/managers/gods/list/Minotaure.java
@@ -4,11 +4,8 @@
 import fr.zelytra.daedalus.managers.gods.Gods;
 import fr.zelytra.daedalus.managers.items.CustomItemStack;
 import fr.zelytra.daedalus.managers.items.CustomMaterial;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
@@ -24,11 +21,6 @@ public Minotaure(Faction faction) {
         playerList.remove(god.getUniqueId());
 
         ItemStack item = new CustomItemStack(CustomMaterial.MINOTAUR_HEAD).getItem();
-        ItemMeta meta = item.getItemMeta();
-        meta.addEnchant(Enchantment.BINDING_CURSE,1,false);
-        meta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
-        item.setItemMeta(meta);
-
         faction.getGod().getInventory().setHelmet(item);
 
     }