Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2025-01-03 06:57:58 +01:00
Code Issues Projects Releases Wiki Activity

Fixed NPC's causing Questing problems when moving/killing

Browse Source
This commit is contained in:
Blackvein 2012-10-10 15:25:05 -07:00
parent e8a4599791
commit 35244379a5
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/me/blackvein/quests/PlayerListener.java
View File

@ -354,28 +354,26 @@ public class PlayerListener implements Listener {
Projectile p = (Projectile) damager; Projectile p = (Projectile) damager;
if(p.getShooter() instanceof Player){ if(p.getShooter() instanceof Player){
try{
Player player = (Player) p.getShooter(); Player player = (Player) p.getShooter();
Quester quester = plugin.getQuester(player.getName()); if(plugin.citizens.getNPCRegistry().isNPC(player) == false){
if(quester.hasObjective("killMob"))
quester.killMob(evt.getEntity().getLocation(), evt.getEntity().getType());
}catch(Exception e){
//Do nothing, killer is an NPC
}
Quester quester = plugin.getQuester(player.getName());
if(quester.hasObjective("killMob"))
quester.killMob(evt.getEntity().getLocation(), evt.getEntity().getType());
}
} }
}else if(damager instanceof Player){ }else if(damager instanceof Player){
try{ if(plugin.citizens.getNPCRegistry().isNPC(damager) == false){
Player player = (Player) damager; Player player = (Player) damager;
Quester quester = plugin.getQuester(player.getName()); Quester quester = plugin.getQuester(player.getName());
if(quester.hasObjective("killMob")) if(quester.hasObjective("killMob"))
quester.killMob(evt.getEntity().getLocation(), evt.getEntity().getType()); quester.killMob(evt.getEntity().getLocation(), evt.getEntity().getType());
}catch (Exception e){
//Do nothing, killer is an NPC
}
}
} }
} }
@ -402,19 +400,26 @@ public class PlayerListener implements Listener {
if(p.getShooter() instanceof Player){ if(p.getShooter() instanceof Player){
Player player = (Player) p.getShooter(); Player player = (Player) p.getShooter();
Quester quester = plugin.getQuester(player.getName()); if(plugin.citizens.getNPCRegistry().isNPC(player) == false){
if(quester.hasObjective("killPlayer"))
quester.killPlayer(evt.getEntity().getName()); Quester quester = plugin.getQuester(player.getName());
if(quester.hasObjective("killPlayer"))
quester.killPlayer(evt.getEntity().getName());
}
} }
}else if(damager instanceof Player){ }else if(damager instanceof Player){
Player player = (Player) damager; Player player = (Player) damager;
Quester quester = plugin.getQuester(player.getName()); if(plugin.citizens.getNPCRegistry().isNPC(player) == false){
if(quester.hasObjective("killPlayer"))
quester.killPlayer(evt.getEntity().getName());
Quester quester = plugin.getQuester(player.getName());
if(quester.hasObjective("killPlayer"))
quester.killPlayer(evt.getEntity().getName());
}
} }
} }
@ -483,10 +488,15 @@ public class PlayerListener implements Listener {
@EventHandler @EventHandler
public void onPlayerMove(PlayerMoveEvent evt){ public void onPlayerMove(PlayerMoveEvent evt){
Quester quester = plugin.getQuester(evt.getPlayer().getName()); if(plugin.citizens.getNPCRegistry().isNPC(evt.getPlayer()) == false){
if(quester.hasObjective("reachLocation")){
quester.reachLocation(evt.getTo()); Quester quester = plugin.getQuester(evt.getPlayer().getName());
if(quester.hasObjective("reachLocation")){
quester.reachLocation(evt.getTo());
}
} }