Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-02-28 15:41:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Custom crafting with shaped and shapless recipes rework ready...

Browse Source
This commit is contained in:
Gunging 2021-03-29 09:42:22 -05:00
parent 3ffde990d1
commit c4266fb61d
1 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/net/Indyuce/mmoitems/listener/DurabilityListener.java
View File

@ -3,10 +3,14 @@ package net.Indyuce.mmoitems.listener;
import net.Indyuce.mmoitems.api.interaction.util.DurabilityItem; import net.Indyuce.mmoitems.api.interaction.util.DurabilityItem;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityShootBowEvent; import org.bukkit.event.entity.EntityShootBowEvent;
import org.bukkit.event.player.PlayerItemDamageEvent; import org.bukkit.event.player.PlayerItemDamageEvent;
@ -26,40 +30,6 @@ public class DurabilityListener implements Listener {
/** /**
* Handles custom durability for non-'vanilla durability' items * Handles custom durability for non-'vanilla durability' items
*/ */
<<<<<<< src/main/java/net/Indyuce/mmoitems/listener/DurabilityListener.java
// @EventHandler(ignoreCancelled = true)
// public void playerDamage(EntityDamageEvent event) {
// if (event.getEntityType() != EntityType.PLAYER || ignoredCauses.contains(event.getCause()))
// return;
//
// Player player = (Player) event.getEntity();
// int damage = Math.max((int) event.getDamage() / 4, 1);
// for(EquipmentSlot slot : slots)
// if(hasItem(player, slot))
// handleVanillaDamage(player.getInventory().getItem(slot), player, slot, damage);
// }
//
// @EventHandler(ignoreCancelled = true)
// public void playerMeleeAttack(EntityDamageByEntityEvent event) {
// if (event.getDamage() == 0 || event.getCause() != DamageCause.ENTITY_ATTACK || !(event.getEntity() instanceof LivingEntity)
// || !(event.getDamager() instanceof Player) || event.getEntity().hasMetadata("NPC") || event.getDamager().hasMetadata("NPC"))
// return;
// Player player = (Player) event.getDamager();
// ItemStack item = player.getInventory().getItemInMainHand();
//
// handleVanillaDamage(item, player, EquipmentSlot.HAND, 1);
// }
//
// @EventHandler(ignoreCancelled = true)
// public void playerBowAttack(EntityShootBowEvent event) {
// if (!(event.getEntity() instanceof Player))
// return;
// Player player = (Player) event.getEntity();
// ItemStack item = event.getBow();
//
// handleVanillaDamage(item, player, EquipmentSlot.HAND, 1);
// }
=======
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
public void playerDamage(EntityDamageEvent event) { public void playerDamage(EntityDamageEvent event) {
if (event.getEntityType() != EntityType.PLAYER || ignoredCauses.contains(event.getCause())) if (event.getEntityType() != EntityType.PLAYER || ignoredCauses.contains(event.getCause()))
@ -92,7 +62,6 @@ public class DurabilityListener implements Listener {
handleVanillaDamage(item, player, EquipmentSlot.HAND, 1); handleVanillaDamage(item, player, EquipmentSlot.HAND, 1);
} }
>>>>>>> src/main/java/net/Indyuce/mmoitems/listener/DurabilityListener.java
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
public void itemDamage(PlayerItemDamageEvent event) { public void itemDamage(PlayerItemDamageEvent event) {