Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-12-23 01:27:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix killing NPCs with bow/arrow. Issue was combination of NPCs counting

Browse Source 
as Players, and Quests treating them as mobs. Fixes #102
This commit is contained in:
HappyPikachu 2015-05-20 19:27:26 -04:00
parent a518accd74
commit 36a530f3cf
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/me/blackvein/quests/PlayerListener.java
View File

@ -598,7 +598,17 @@ public class PlayerListener implements Listener, ColorUtil {
@EventHandler @EventHandler
public void onEntityDeath(EntityDeathEvent evt) { public void onEntityDeath(EntityDeathEvent evt) {
if (evt.getEntity() instanceof Player == false) { //NPCs count as a Player so we check for them through Citizens
boolean isTargetNPC = false;
if (plugin.citizens != null) {
if (CitizensAPI.getNPCRegistry().isNPC(evt.getEntity())) {
isTargetNPC = true;
}
}
if (evt.getEntity() instanceof Player == false || isTargetNPC) {
if (evt.getEntity().getLastDamageCause() instanceof EntityDamageByEntityEvent) { if (evt.getEntity().getLastDamageCause() instanceof EntityDamageByEntityEvent) {
EntityDamageByEntityEvent damageEvent = (EntityDamageByEntityEvent) evt.getEntity().getLastDamageCause(); EntityDamageByEntityEvent damageEvent = (EntityDamageByEntityEvent) evt.getEntity().getLastDamageCause();
@ -607,10 +617,10 @@ public class PlayerListener implements Listener, ColorUtil {
if (damager instanceof Projectile) { if (damager instanceof Projectile) {
Projectile projectile = (Projectile)damager; Projectile projectile = (Projectile)damager;
ProjectileSource source = projectile.getShooter(); @SuppressWarnings("deprecation")
ProjectileSource source = projectile.getShooter();
if (source instanceof Player) { if (source instanceof Player) {
Player player = (Player) source; Player player = (Player) source;
boolean okay = true; boolean okay = true;
@ -619,20 +629,35 @@ public class PlayerListener implements Listener, ColorUtil {
okay = false; okay = false;
} }
} }
if (okay) { if (okay) {
Quester quester = plugin.getQuester(player.getUniqueId()); if (isTargetNPC) {
Quester quester = plugin.getQuester(player.getUniqueId());
for (Quest quest : quester.currentQuests.keySet()) { for (Quest quest : quester.currentQuests.keySet()) {
if (quester.hasObjective(quest, "killNPC")) {
quester.killNPC(quest, CitizensAPI.getNPCRegistry().getNPC(evt.getEntity()));
}
}
} else {
Quester quester = plugin.getQuester(player.getUniqueId());
for (Quest quest : quester.currentQuests.keySet()) {
if (quester.hasObjective(quest, "killMob")) {
quester.killMob(quest, evt.getEntity().getLocation(), evt.getEntity().getType());
}
if (quester.hasObjective(quest, "killMob")) {
quester.killMob(quest, evt.getEntity().getLocation(), evt.getEntity().getType());
} }
} }
} }
} }
} else if (damager instanceof TNTPrimed) { } else if (damager instanceof TNTPrimed) {