Fix potentially copying empty set

neoforged · Sep 7, 2024 · b05e171 · b05e171
1 parent de4e095
commit b05e171
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/patches/net/minecraft/world/level/block/state/BlockBehaviour.java.patch b/patches/net/minecraft/world/level/block/state/BlockBehaviour.java.patch
@@ -165,12 +165,16 @@
 
          private Properties() {
          }
-@@ -1020,6 +_,8 @@
+@@ -1020,6 +_,12 @@
              blockbehaviour$properties.offsetFunction = blockbehaviour$properties1.offsetFunction;
              blockbehaviour$properties.spawnTerrainParticles = blockbehaviour$properties1.spawnTerrainParticles;
              blockbehaviour$properties.requiredFeatures = blockbehaviour$properties1.requiredFeatures;
-+            blockbehaviour$properties.requiredFlags = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<>();
-+            blockbehaviour$properties.requiredFlags.addAll(blockbehaviour$properties1.requiredFlags);
++
++            if(!blockbehaviour$properties1.requiredFlags.isEmpty()) {
++                blockbehaviour$properties.requiredFlags = new it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet<>();
++                blockbehaviour$properties.requiredFlags.addAll(blockbehaviour$properties1.requiredFlags);
++            }
++
              blockbehaviour$properties.emissiveRendering = blockbehaviour$properties1.emissiveRendering;
              blockbehaviour$properties.instrument = blockbehaviour$properties1.instrument;
              blockbehaviour$properties.replaceable = blockbehaviour$properties1.replaceable;