From d043037d26aab8989877730528d998a28471c9a7 Mon Sep 17 00:00:00 2001
From: bloodshot <jdroque@gmail.com>
Date: Thu, 9 Apr 2020 15:57:49 -0400
Subject: [PATCH] Fix NPE during pvp protection checks.

---
 .../java/com/griefdefender/listener/EntityEventHandler.java   | 4 ++--
 .../java/com/griefdefender/listener/EntityEventHandler.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bukkit/src/main/java/com/griefdefender/listener/EntityEventHandler.java b/bukkit/src/main/java/com/griefdefender/listener/EntityEventHandler.java
index 20b8e44..7233744 100644
--- a/bukkit/src/main/java/com/griefdefender/listener/EntityEventHandler.java
+++ b/bukkit/src/main/java/com/griefdefender/listener/EntityEventHandler.java
@@ -399,7 +399,7 @@ public boolean protectEntity(Event event, Object source, Entity targetEntity) {
         GDPermissionUser user = null;
         if (source instanceof Player && targetUser != null) {
             user = PermissionHolderCache.getInstance().getOrCreateUser(((Player) source).getUniqueId());
-            if (user.getOnlinePlayer() != null) {
+            if (user.getOnlinePlayer() != null && targetUser.getOnlinePlayer() != null) {
                 return this.getPvpProtectResult(event, claim, user, targetUser);
             }
         }
@@ -422,7 +422,7 @@ public boolean protectEntity(Event event, Object source, Entity targetEntity) {
         }
         if (owner != null && targetUser != null && !owner.equals(targetUser.getUniqueId())) {
             final GDPermissionUser sourceUser = PermissionHolderCache.getInstance().getOrCreateUser(owner);
-            if (sourceUser.getOnlinePlayer() != null) {
+            if (sourceUser.getOnlinePlayer() != null && targetUser.getOnlinePlayer() != null) {
                 return this.getPvpProtectResult(event, claim, sourceUser, targetUser);
             }
         }
diff --git a/sponge/src/main/java/com/griefdefender/listener/EntityEventHandler.java b/sponge/src/main/java/com/griefdefender/listener/EntityEventHandler.java
index ff04368..9a704fc 100644
--- a/sponge/src/main/java/com/griefdefender/listener/EntityEventHandler.java
+++ b/sponge/src/main/java/com/griefdefender/listener/EntityEventHandler.java
@@ -500,7 +500,7 @@ public boolean protectEntity(Event event, Entity targetEntity, Cause cause, Dama
         final GDPermissionUser targetUser = targetEntity instanceof Player ? PermissionHolderCache.getInstance().getOrCreateUser((Player) targetEntity) : null;
         if (source instanceof Player && targetUser != null) {
             final GDPermissionUser sourceUser = PermissionHolderCache.getInstance().getOrCreateUser(((Player) source).getUniqueId());
-            if (sourceUser.getOnlinePlayer() != null) {
+            if (sourceUser.getOnlinePlayer() != null && targetUser.getOnlinePlayer() != null) {
                 return this.getPvpProtectResult(event, claim, sourceUser, targetUser);
             }
         }