Upstream
/
Quests
mirror of https://github.com/PikaMug/Quests.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

NPCs killable with projectiles, fixes #1940

This commit is contained in:
PikaMug 2022-04-28 01:03:21 -04:00
parent 2d3592a89c
commit 939b6b8f63
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/me/blackvein/quests/listeners/NpcListener.java
View File

@ -292,9 +292,8 @@ public class NpcListener implements Listener {
final ObjectiveType type = ObjectiveType.KILL_NPC;
final Set<String> dispatchedQuestIDs = new HashSet<>();
Player player = null;
if (damager instanceof Projectile
&& evt.getNPC().getEntity().getLastDamageCause().getEntity() instanceof Player) {
player = (Player) evt.getNPC().getEntity().getLastDamageCause().getEntity();
if (damager instanceof Projectile && ((Projectile)damageEvent.getDamager()).getShooter() instanceof Player) {
player = (Player) ((Projectile)damageEvent.getDamager()).getShooter();
} else if (damager instanceof Player) {
player = (Player) damager;
}