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

Check whether Citizens is loaded for Kill Mobs, fixes #267

Browse Source
This commit is contained in:
HappyPikachu 2018-02-07 13:10:42 -05:00
parent 87c0316ce7
commit e014697010
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -479,8 +479,8 @@ public class PlayerListener implements Listener {
}
/**
* Checks if damager is blacklisted
* Ensures damager is Player and not NPC
* Checks if damager is blacklisted.
* Ensures damager is Player and not NPC.
* Kills target mob/NPC if objective exists
*
* @param damager the attacking entity
@ -491,23 +491,22 @@ public class PlayerListener implements Listener {
if (plugin.checkQuester(damager.getUniqueId()) == true) {
return;
}
//Ensure damager is Player AND not an NPC
if (damager instanceof Player && !CitizensAPI.getNPCRegistry().isNPC(damager)) {
//If target is an NPC...
if (CitizensAPI.getNPCRegistry().isNPC(target)) {
Quester quester = plugin.getQuester(damager.getUniqueId());
for (Quest quest : quester.currentQuests.keySet()) {
if (quester.hasObjective(quest, "killNPC")) {
quester.killNPC(quest, CitizensAPI.getNPCRegistry().getNPC(target));
if (damager instanceof Player) {
if (plugin.citizens != null) {
if (CitizensAPI.getNPCRegistry().isNPC(target)) {
Quester quester = plugin.getQuester(damager.getUniqueId());
for (Quest quest : quester.currentQuests.keySet()) {
if (quester.hasObjective(quest, "killNPC")) {
quester.killNPC(quest, CitizensAPI.getNPCRegistry().getNPC(target));
}
}
return;
}
//No? Must be a mob...
} else {
Quester quester = plugin.getQuester(damager.getUniqueId());
for (Quest quest : quester.currentQuests.keySet()) {
if (quester.hasObjective(quest, "killMob")) {
quester.killMob(quest, target.getLocation(), target.getType());
}
}
Quester quester = plugin.getQuester(damager.getUniqueId());
for (Quest quest : quester.currentQuests.keySet()) {
if (quester.hasObjective(quest, "killMob")) {
quester.killMob(quest, target.getLocation(), target.getType());
}
}
}