From 9165d4c3a103ca1065e07666c13e5f2b30482915 Mon Sep 17 00:00:00 2001
From: SizableShrimp <sizableshrimp@sizableshrimp.me>
Date: Thu, 19 Aug 2021 00:44:26 -0500
Subject: [PATCH] Fix entities not spawning in structures (#8020)

This affects swamp huts, pillager outposts, ocean monuments, and nether fortresses
---
 .../minecraft/net/minecraft/data/tags/TagsProvider.java.patch   | 2 +-
 .../net/minecraftforge/common/world/StructureSpawnManager.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/minecraft/net/minecraft/data/tags/TagsProvider.java.patch b/patches/minecraft/net/minecraft/data/tags/TagsProvider.java.patch
index 1493618546..dffa2031a1 100644
--- a/patches/minecraft/net/minecraft/data/tags/TagsProvider.java.patch
+++ b/patches/minecraft/net/minecraft/data/tags/TagsProvider.java.patch
@@ -77,7 +77,7 @@
 -   protected static class TagAppender<T> {
 +   public static class TagAppender<T> implements net.minecraftforge.common.extensions.IForgeTagAppender<T> {
        private final Tag.Builder f_126568_;
-       private final Registry<T> f_126569_;
+       public final Registry<T> f_126569_;
        private final String f_126570_;
 @@ -114,7 +_,7 @@
           return this;
diff --git a/src/main/java/net/minecraftforge/common/world/StructureSpawnManager.java b/src/main/java/net/minecraftforge/common/world/StructureSpawnManager.java
index 33618aa196..c0d458306a 100644
--- a/src/main/java/net/minecraftforge/common/world/StructureSpawnManager.java
+++ b/src/main/java/net/minecraftforge/common/world/StructureSpawnManager.java
@@ -76,7 +76,7 @@ public class StructureSpawnManager
         ImmutableMap.Builder<net.minecraft.world.entity.MobCategory, WeightedRandomList<MobSpawnSettings.SpawnerData>> builder = ImmutableMap.builder();
         event.getEntitySpawns().forEach((classification, spawns) -> {
             if (!spawns.isEmpty())
-                builder.put(classification, WeightedRandomList.create());
+                builder.put(classification, WeightedRandomList.create(spawns));
         });
         ImmutableMap<MobCategory, WeightedRandomList<MobSpawnSettings.SpawnerData>> entitySpawns = builder.build();
         if (!entitySpawns.isEmpty())