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

Damager and target cannot be the same for kill objectives, fixes #1128

This commit is contained in:
PikaMug 2020-03-20 03:32:45 -04:00
parent b5bb35b043
commit b73ba750fe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/main/java/me/blackvein/quests/listeners/PlayerListener.java
View File

@ -859,14 +859,16 @@ public class PlayerListener implements Listener {
/**
* Checks if damager is blacklisted. Ensures damager and target are Player and not NPC.
* Kills target Player if objective exists
* Kills target Player if objective exists<p>
*
* As of 3.8.9, damager and target must not be the same entity
*
* @param damager the attacking entity
* @param target the entity being attacked
* @since 3.1.4
*/
public void preKillPlayer(Entity damager, Entity target) {
if (damager == null) {
if (damager == null || target == null || damager.equals(target)) {
return;
}
if (!plugin.canUseQuests(damager.getUniqueId())) {