Merge branch '1.20.4' into 1.20.6

* 1.20.4: Updated changelog, fixed flammabilit
Faboslav · Oct 3, 2024 · ea49583 · ea49583
2 parents 172e674 + b7cdf24
commit ea49583
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 ## 3.0.4
 
 - Improved internal registries logic (Might fix some crashes)
-- Mod should now not crash with mods like Caverns & Chasms and Unvoted & Shelved
+- Fixed crashes with mods like Caverns & Chasms, Unvoted & Shelved and Sinytra Connector
+- Fixed block flammability
 
 ## 3.0.3
 

diff --git a/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesBlocks.java b/common/src/main/java/com/faboslav/friendsandfoes/common/init/FriendsAndFoesBlocks.java
@@ -67,7 +67,7 @@ public static void registerFlammablity(RegisterFlammabilityEvent event) {
 			.map(RegistryEntry::get)
 			.filter(block -> block instanceof BeehiveBlock && (block != WARPED_BEEHIVE && block != CRIMSON_BEEHIVE)) // TODO check this
 			.map(block -> (BeehiveBlock) block)
-			.forEach(item -> event.register(ACACIA_BEEHIVE.get(), 20, 5));
+			.forEach(block -> event.register(block, 20, 5));
 	}
 
 	private FriendsAndFoesBlocks() {