Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,20 @@ public void onItemDamage(PlayerItemDamageEvent event) {
if (friend.isCancelEvent()) {
event.setCancelled(true);
}

ItemMeta im = event.getItem().getItemMeta();
Damageable damageable = (Damageable) im;
event.setDamage((int) Math.ceil(event.getDamage() * friend.getDurabilityMod())); // Modify the damage taken

if ((damageable.getDamage() + event.getDamage()) >= event.getItem().getType().getMaxDurability()) { // This will break the tool, lets stop that!
damageable.setDamage(event.getItem().getType().getMaxDurability() - 1);
damagedItem.setItemMeta(im);
event.setCancelled(true);
} else if (event instanceof FakeItemDamageEvent) {
damageable.setDamage(damageable.getDamage() + event.getDamage());
damagedItem.setItemMeta(im);
// fix issue 97: only when the event is not cancelled should we check durability and set damage
if(!event.isCancelled()){
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if(!event.isCancelled()){
if (!event.isCancelled()) {

ItemMeta im = event.getItem().getItemMeta();
Damageable damageable = (Damageable) im;
event.setDamage((int) Math.ceil(event.getDamage() * friend.getDurabilityMod())); // Modify the damage taken

if ((damageable.getDamage() + event.getDamage()) >= event.getItem().getType().getMaxDurability()) { // This will break the tool, lets stop that!
damageable.setDamage(event.getItem().getType().getMaxDurability() - 1);
damagedItem.setItemMeta(im);
event.setCancelled(true);
} else if (event instanceof FakeItemDamageEvent) {
damageable.setDamage(damageable.getDamage() + event.getDamage());
damagedItem.setItemMeta(im);
}
}
}

Expand Down
Loading