Remove null enchantments

Hopefully fixes SquidDev-CC#269.
123FLO321 · Jun 13, 2020 · 07ccc4d · 07ccc4d
1 parent a7b5882
commit 07ccc4d
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/src/main/java/org/squiddev/plethora/integration/vanilla/meta/VanillaMeta.java b/src/main/java/org/squiddev/plethora/integration/vanilla/meta/VanillaMeta.java
@@ -31,10 +31,7 @@
 import org.squiddev.plethora.utils.WorldDummy;
 
 import javax.annotation.Nonnull;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Injects
 public final class VanillaMeta {
@@ -134,16 +131,18 @@ public BlockPos getSpawnerPosition() {
 			Map<Enchantment, Integer> enchants = EnchantmentHelper.getEnchantments(target);
 			if (enchants.isEmpty()) return Collections.emptyMap();
 
-			return Collections.singletonMap("enchantments", Helpers.map(enchants.entrySet(), entry -> {
-				Enchantment enchantment = entry.getKey();
-				int level = entry.getValue();
-				HashMap<String, Object> enchant = new HashMap<>(3);
-				enchant.put("name", enchantment.getName());
-				enchant.put("level", level);
-				enchant.put("fullName", enchantment.getTranslatedName(level));
-
-				return enchant;
-			}));
+			return Collections.singletonMap("enchantments", enchants.entrySet().stream()
+				.filter(Objects::nonNull)
+				.map(entry -> {
+					Enchantment enchantment = entry.getKey();
+					int level = entry.getValue();
+					HashMap<String, Object> enchant = new HashMap<>(3);
+					enchant.put("name", enchantment.getName());
+					enchant.put("level", level);
+					enchant.put("fullName", enchantment.getTranslatedName(level));
+
+					return enchant;
+				}).collect(Helpers.tinyCollect()));
 		}
 
 		@Nonnull