From 6a6413a371bab821019b8dadcf4a8308a2d39237 Mon Sep 17 00:00:00 2001
From: Taah <spacerocket62@gmail.com>
Date: Mon, 28 Feb 2022 12:44:43 -0800
Subject: [PATCH] - fix casting errors & npe

---
 src/main/java/dev/plex/packet/impl/SkullOwnerPatch.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/dev/plex/packet/impl/SkullOwnerPatch.java b/src/main/java/dev/plex/packet/impl/SkullOwnerPatch.java
index 958d8c2..229abfb 100644
--- a/src/main/java/dev/plex/packet/impl/SkullOwnerPatch.java
+++ b/src/main/java/dev/plex/packet/impl/SkullOwnerPatch.java
@@ -10,6 +10,7 @@ import net.minecraft.world.item.ItemStack;
 import org.bukkit.Material;
 import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer;
 import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftItemStack;
+import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
@@ -26,8 +27,9 @@ public class SkullOwnerPatch implements IPacketListener<ServerboundSetCreativeMo
         org.bukkit.inventory.ItemStack bukkitItem = event.getCurrentItem();
 
         if (bukkitItem == null) return;
+        if (event.getWhoClicked().getType() != EntityType.PLAYER) return;
 
-        checkItem((Player) event.getWhoClicked(), bukkitItem);
+        checkItem(((CraftPlayer)event.getWhoClicked()).getHandle(), bukkitItem);
     }
 
     @EventHandler
@@ -49,6 +51,7 @@ public class SkullOwnerPatch implements IPacketListener<ServerboundSetCreativeMo
     private boolean checkItem(Player player, org.bukkit.inventory.ItemStack bukkitItem)
     {
         Blackout.debug("Starting skull owner exploit patch...");
+        if (bukkitItem == null) return true;
         ItemStack item = ((CraftItemStack)bukkitItem).handle;
         if (item.getBukkitStack().getType() != Material.PLAYER_HEAD) return true;