coral/OgreDupeAlias
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

edited burst melee

Browse Source
This commit is contained in:
ImproperIssues
2023-05-06 11:32:46 -07:00
parent f703d9e59e
commit ab3f1dc4e2
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/fun/ogre/ogredupealias/events/EntityDamageListener.java
View File

@@ -1,8 +1,6 @@
package fun.ogre.ogredupealias.events; package fun.ogre.ogredupealias.events;
import fun.ogre.ogredupealias.plugin.ItemPresets;
import fun.ogre.ogredupealias.plugin.RecipientList; import fun.ogre.ogredupealias.plugin.RecipientList;
import fun.ogre.ogredupealias.utils.ItemUtils;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -23,7 +21,7 @@ public class EntityDamageListener implements Listener {
@EventHandler @EventHandler
public void onDamageByEntity(EntityDamageByEntityEvent e) { public void onDamageByEntity(EntityDamageByEntityEvent e) {
try { try {
//this.handleBurstMelee(e); this.handleBurstMelee(e);
} }
catch (Exception ignore) {} catch (Exception ignore) {}
} }
@@ -31,7 +29,7 @@ public class EntityDamageListener implements Listener {
@EventHandler @EventHandler
public void onDamage(EntityDamageEvent e) { public void onDamage(EntityDamageEvent e) {
try { try {
//this.handleBurstMelee(e); this.handleBurstMelee(e);
this.handleThornsBypass(e); this.handleThornsBypass(e);
} }
catch (Exception ignore) {} catch (Exception ignore) {}
@@ -56,7 +54,7 @@ public class EntityDamageListener implements Listener {
if (ent instanceof Player p ) { if (ent instanceof Player p ) {
final ItemStack item = p.getInventory().getItemInMainHand(); final ItemStack item = p.getInventory().getItemInMainHand();
if (ItemUtils.getDisplay(item).equals(ItemUtils.getDisplay(ItemPresets.TROLL_SWORD)) || attackCooldownBypassers.isRecipient(p)) { if (attackCooldownBypassers.isRecipient(p)) {
e.setCancelled(true); e.setCancelled(true);
} }
} }
@@ -73,7 +71,7 @@ public class EntityDamageListener implements Listener {
final ItemStack item = pDamager.getInventory().getItemInMainHand(); final ItemStack item = pDamager.getInventory().getItemInMainHand();
if (ItemUtils.getDisplay(item).equals(ItemUtils.getDisplay(ItemPresets.TROLL_SWORD)) || attackCooldownBypassers.isRecipient(pDamager)) { if (attackCooldownBypassers.isRecipient(pDamager)) {
vLiving.setNoDamageTicks(NO_DAMAGE_TICKS); vLiving.setNoDamageTicks(NO_DAMAGE_TICKS);
vLiving.setMaximumNoDamageTicks(MAX_NO_DAMAGE_TICKS); vLiving.setMaximumNoDamageTicks(MAX_NO_DAMAGE_TICKS);
} }