yanwah/cobblemon
1
0
Fork 0
forked from mirrors/cobblemon
Code Pull Requests Activity

Merge branch 'type-gem-feature-gaslighting-max-fix' into 'main'

Browse Source 
Fix to Type Gem Feature having a chance to cause an infinite loop during generation, stalling world gen

See merge request cable-mc/cobblemon!2233
This commit is contained in:
Polymeta
2026-04-28 18:46:06 +00:00
parent 463d341965 ce7e465d99
commit c9c5488be7
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/kotlin/com/cobblemon/mod/common/block/TypeGemCoreBlock.kt
+7 -9
View File
@@ -148,7 +148,7 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
for ((gemState, gemPos) in connectedGems.shuffled(javaRandom)) {
val registryKey = BuiltInRegistries.BLOCK.getKey(gemState.block)
val clusterBlock = BLOCK_TO_CLUSTER[registryKey]
val clusterBlock = BLOCK_TO_CLUSTER[registryKey] ?: continue // If there is no block to grow, skip the block
for (dir in Direction.entries.shuffled(javaRandom)) {
val targetPos = gemPos.relative(dir)
@@ -158,16 +158,14 @@ class TypeGemCoreBlock(properties: Properties) : Block(properties) {
if (!isPositionValidForGrowth(level, targetPos)) continue
// Place gem cluster
if (clusterBlock != null) {
var placeState = clusterBlock.defaultBlockState()
.setValue(DirectionalBlock.FACING, dir)
.setValue(TypeGemClusterBlock.STAGE, 0)
.setValue(SHOULD_GROW, true)
val placeState = clusterBlock.defaultBlockState()
.setValue(DirectionalBlock.FACING, dir)
.setValue(TypeGemClusterBlock.STAGE, 0)
.setValue(SHOULD_GROW, true)
level.setBlock(targetPos, placeState, UPDATE_ALL)
}
level.setBlock(targetPos, placeState, UPDATE_ALL)
if (forced && clusterBlock != null) {
if (forced) {
forceAdvanceClusterGrowth(level, targetPos, random)
}