Merge branch '1.20.6' into 1.21.1

* 1.20.6: Fixed type
Faboslav · Nov 15, 2024 · 155b818 · 155b818
2 parents a783dde + 3744844
commit 155b818
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/...src/main/java/com/faboslav/friendsandfoes/fabric/mixin/StructureEntityProcessorMixin.java b/...src/main/java/com/faboslav/friendsandfoes/fabric/mixin/StructureEntityProcessorMixin.java
@@ -128,12 +128,7 @@ private void friendsandfoes_processEntities(
 							serverWorldAccess,
 							serverWorldAccess.getLocalDifficulty(BlockPos.ofFloored(entityPos)),
 							SpawnReason.STRUCTURE,
-<<<<<<< HEAD
 							null
-=======
-							null,
-							entityNbt
->>>>>>> 1.20.4
 						);
 					}