From 120149b91032473f6d6b5ff84a2e4eaa34b1f155 Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Sat, 3 Oct 2020 11:07:46 +0100
Subject: [PATCH] Updated to beta19

---
 API/pom.xml                                                     | 2 +-
 NMS/v1_15_R1/pom.xml                                            | 2 +-
 NMS/v1_16_R1/pom.xml                                            | 2 +-
 NMS/v1_16_R2/pom.xml                                            | 2 +-
 Plugin/pom.xml                                                  | 2 +-
 .../willfp/ecoenchants/display/packets/PacketWindowItems.java   | 1 +
 Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java  | 2 +-
 pom.xml                                                         | 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/API/pom.xml b/API/pom.xml
index 57ff17cf..ed2804c2 100644
--- a/API/pom.xml
+++ b/API/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta17</version>
+        <version>5.0.0-beta19</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/NMS/v1_15_R1/pom.xml b/NMS/v1_15_R1/pom.xml
index d5894d57..cb528c44 100644
--- a/NMS/v1_15_R1/pom.xml
+++ b/NMS/v1_15_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta17</version>
+        <version>5.0.0-beta19</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/NMS/v1_16_R1/pom.xml b/NMS/v1_16_R1/pom.xml
index 79e278cd..d8d7dab5 100644
--- a/NMS/v1_16_R1/pom.xml
+++ b/NMS/v1_16_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta17</version>
+        <version>5.0.0-beta19</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/NMS/v1_16_R2/pom.xml b/NMS/v1_16_R2/pom.xml
index 01aeea98..9ef9560b 100644
--- a/NMS/v1_16_R2/pom.xml
+++ b/NMS/v1_16_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta17</version>
+        <version>5.0.0-beta19</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/Plugin/pom.xml b/Plugin/pom.xml
index 6fe57c01..fd16e9c4 100644
--- a/Plugin/pom.xml
+++ b/Plugin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta17</version>
+        <version>5.0.0-beta19</version>
     </parent>
 
     <artifactId>plugin</artifactId>
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java
index bf0db761..6ea9f1bf 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java
@@ -14,6 +14,7 @@ public final class PacketWindowItems extends AbstractPacketAdapter {
     @Override
     public void onSend(PacketContainer packet) {
         packet.getItemListModifier().modify(0, (itemStacks) -> {
+            if(itemStacks == null) return null;
             itemStacks.forEach(item -> {
                 boolean hideEnchants = false;
 
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java
index 7d46f1ea..c490b128 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java
@@ -159,6 +159,7 @@ public class Loader {
             if(Bukkit.getPluginManager().isPluginEnabled("Essentials")) {
                 EssentialsManager.registerEssentials(new IntegrationEssentials());
                 Logger.info("Essentials: §aENABLED");
+                EssentialsManager.registerEnchantments();
             } else {
                 Logger.info("Essentials: §9DISABLED");
             }
@@ -315,7 +316,6 @@ public class Loader {
             Bukkit.getPluginManager().disablePlugin(EcoEnchantsPlugin.getInstance());
             return;
         } else {
-            EssentialsManager.registerEnchantments();
             Logger.info(EcoEnchants.getAll().size() + " Enchantments Loaded:");
             EcoEnchants.getAll().forEach((ecoEnchant -> {
                 if(ecoEnchant.getType().equals(EcoEnchant.EnchantmentType.SPECIAL)) {
diff --git a/pom.xml b/pom.xml
index f6dcd68e..dabee054 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.willfp.ecoenchants</groupId>
     <artifactId>parent</artifactId>
-    <version>5.0.0-beta17</version>
+    <version>5.0.0-beta19</version>
     <packaging>pom</packaging>
     <name>EcoEnchants Parent</name>