From bea0d9c7df4d4ae915c75c1706ea1595f3ea2b55 Mon Sep 17 00:00:00 2001
From: YouHaveTrouble <youhavetrouble@youhavetrouble.me>
Date: Fri, 17 Sep 2021 15:28:34 +0200
Subject: [PATCH] make sure mount has player rider before checking for attack
 cancel

---
 src/main/java/me/youhavetrouble/preventstabby/util/Util.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/me/youhavetrouble/preventstabby/util/Util.java b/src/main/java/me/youhavetrouble/preventstabby/util/Util.java
index a1f6239..5f12159 100644
--- a/src/main/java/me/youhavetrouble/preventstabby/util/Util.java
+++ b/src/main/java/me/youhavetrouble/preventstabby/util/Util.java
@@ -45,14 +45,16 @@ public class Util {
 
         Set<UUID> playerPassengersWithPvpEnabled = new HashSet<>();
 
+        boolean hasPlayerPassengers = false;
         for (Entity passenger : mount.getPassengers()) {
             if (!(passenger instanceof Player)) continue;
             Player player = (Player) passenger;
+            hasPlayerPassengers = true;
             if (PreventStabby.getPlugin().getPlayerManager().getPlayerPvPState(player.getUniqueId()))
                 playerPassengersWithPvpEnabled.add(player.getUniqueId());
         }
 
-        if (!mount.getPassengers().isEmpty() && playerPassengersWithPvpEnabled.isEmpty()) {
+        if (hasPlayerPassengers && playerPassengersWithPvpEnabled.isEmpty()) {
             PluginMessages.sendActionBar(attacker, config.getCannot_attack_mounts_victim());
             return true;
         }