Skip to content

Commit b1c9be3

Browse files
committed
track kills for bows and crossbows
1 parent f970f17 commit b1c9be3

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

src/main/java/lol/hyper/toolstats/events/EntityDamage.java

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
import org.bukkit.ChatColor;
2222
import org.bukkit.GameMode;
2323
import org.bukkit.Material;
24-
import org.bukkit.entity.Entity;
25-
import org.bukkit.entity.LivingEntity;
26-
import org.bukkit.entity.Player;
27-
import org.bukkit.entity.Trident;
24+
import org.bukkit.entity.*;
2825
import org.bukkit.event.EventHandler;
2926
import org.bukkit.event.Listener;
3027
import org.bukkit.event.entity.EntityDamageByBlockEvent;
@@ -98,6 +95,23 @@ public void onDamage(EntityDamageByEntityEvent event) {
9895
}
9996
trident.setItem(clone);
10097
}
98+
if (event.getDamager() instanceof Arrow) {
99+
Arrow arrow = (Arrow) event.getDamager();
100+
if (arrow.getShooter() instanceof Player) {
101+
Player player = (Player) arrow.getShooter();
102+
ItemStack heldItem = player.getInventory().getItem(player.getInventory().getHeldItemSlot());
103+
if (heldItem == null) {
104+
return;
105+
}
106+
if (heldItem.getType() == Material.BOW || heldItem.getType() == Material.CROSSBOW) {
107+
if (livingEntity instanceof Player) {
108+
player.getInventory().setItem(player.getInventory().getHeldItemSlot(), updatePlayerKills(heldItem));
109+
} else {
110+
player.getInventory().setItem(player.getInventory().getHeldItemSlot(), updateMobKills(heldItem));
111+
}
112+
}
113+
}
114+
}
101115
}
102116
// player is taken damage but not being killed
103117
if (livingEntity instanceof Player) {

src/main/resources/config.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ enabled:
99
shears: true
1010
bow: true
1111
armor: true
12-
# Will show time the item is created
12+
# Will show time the item is created
1313
created-date:
1414
pickaxe: true
1515
sword: true
@@ -53,10 +53,12 @@ enabled:
5353
sword: true
5454
axe: true
5555
trident: true
56+
bow: true
5657
mob-kills:
5758
sword: true
5859
axe: true
5960
trident: true
61+
bow: true
6062
blocks-mined:
6163
pickaxe: true
6264
shovel: true

0 commit comments

Comments
 (0)