From 2eba5f6933512b41641cded2a23b4611e8893688 Mon Sep 17 00:00:00 2001
From: cswhite2000 <18whitechristop@gmail.com>
Date: Fri, 23 Apr 2021 14:11:41 -0700
Subject: [PATCH] Fix grenades / itemtags

Signed-off-by: cswhite2000 <18whitechristop@gmail.com>
---
 core/src/main/java/tc/oc/pgm/kits/KitMatchModule.java          | 1 +
 .../main/java/tc/oc/pgm/util/inventory/tag/LegacyItemTag.java  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/core/src/main/java/tc/oc/pgm/kits/KitMatchModule.java b/core/src/main/java/tc/oc/pgm/kits/KitMatchModule.java
index c0a3856c66..0ebef94426 100644
--- a/core/src/main/java/tc/oc/pgm/kits/KitMatchModule.java
+++ b/core/src/main/java/tc/oc/pgm/kits/KitMatchModule.java
@@ -145,6 +145,7 @@ public void onGrenadeExplode(final ProjectileHitEvent event) {
       Grenade grenade = Grenade.get(event.getEntity());
       if (grenade != null) {
         event
+            .getEntity()
             .getWorld()
             .createExplosion(
                 event.getEntity(),
diff --git a/util/src/main/java/tc/oc/pgm/util/inventory/tag/LegacyItemTag.java b/util/src/main/java/tc/oc/pgm/util/inventory/tag/LegacyItemTag.java
index 13e6838c21..ed54ad409e 100644
--- a/util/src/main/java/tc/oc/pgm/util/inventory/tag/LegacyItemTag.java
+++ b/util/src/main/java/tc/oc/pgm/util/inventory/tag/LegacyItemTag.java
@@ -43,6 +43,7 @@ final class LegacyItemTag implements ItemTag<String> {
   @Nullable
   @Override
   public String get(ItemStack item) {
+    if (!item.hasItemMeta()) return null;
     final List<String> lore = item.getItemMeta().getLore();
     if (lore == null || lore.isEmpty()) return null;
 
@@ -52,6 +53,7 @@ public String get(ItemStack item) {
 
   @Override
   public void set(ItemStack item, String value) {
+    if (!item.hasItemMeta()) return;
     ItemMeta itemMeta = item.getItemMeta();
     List<String> lore = itemMeta.getLore();
 
@@ -68,6 +70,7 @@ public void set(ItemStack item, String value) {
 
   @Override
   public void clear(ItemStack item) {
+    if (!item.hasItemMeta()) return;
     ItemMeta itemMeta = item.getItemMeta();
     final List<String> lore = itemMeta.getLore();
     if (lore == null || lore.isEmpty()) return;