From 3744844eca5af8b6bd4ed17c5eefa3baba8d7f27 Mon Sep 17 00:00:00 2001 From: Faboslav Date: Fri, 15 Nov 2024 11:02:55 +0100 Subject: [PATCH] Fixed type --- .../fabric/mixin/StructureEntityProcessorMixin.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fabric/src/main/java/com/faboslav/friendsandfoes/fabric/mixin/StructureEntityProcessorMixin.java b/fabric/src/main/java/com/faboslav/friendsandfoes/fabric/mixin/StructureEntityProcessorMixin.java index 5722a1ab..79abb739 100644 --- a/fabric/src/main/java/com/faboslav/friendsandfoes/fabric/mixin/StructureEntityProcessorMixin.java +++ b/fabric/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 ); }