From 956a84a3fbbcc04bade20448e3d5009a07ea086e Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Tue, 11 Jun 2024 10:47:26 -0400
Subject: [PATCH] Enchantment tag can be null

---
 .../java/org/geysermc/geyser/session/cache/TagCache.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java
index 335e940f4..933b57db7 100644
--- a/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java
+++ b/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java
@@ -26,6 +26,7 @@
 package org.geysermc.geyser.session.cache;
 
 import it.unimi.dsi.fastutil.ints.IntArrays;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.GeyserLogger;
 import org.geysermc.geyser.inventory.GeyserItemStack;
@@ -83,8 +84,12 @@ public final class TagCache {
         loadTags("Enchantment", enchantmentTags, ALL_ENCHANTMENT_TAGS, this.enchantments);
     }
 
-    private <T extends Ordered> void loadTags(String type, Map<String, int[]> packetTags, Map<String, T> allTags, int[][] localValues) {
+    private <T extends Ordered> void loadTags(String type, @Nullable Map<String, int[]> packetTags, Map<String, T> allTags, int[][] localValues) {
         Arrays.fill(localValues, IntArrays.EMPTY_ARRAY);
+        if (packetTags == null) {
+            GeyserImpl.getInstance().getLogger().debug("Not loading " + type + " tags; they do not exist here.");
+            return;
+        }
         allTags.forEach((location, tag) -> {
             int[] values = packetTags.get(location);
             if (values != null) {