AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-14 09:56:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

MobSpawnerBlockEntity::isPlayerInRange: don't wait forever

Browse Source 
This workarounds a deadlock.
This commit is contained in:
Moritz Zwerger 2025-02-06 21:06:29 +01:00
parent be5dffcc0a
commit d2d83d85dc
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/de/bixilon/minosoft/data/entities/block/MobSpawnerBlockEntity.kt
View File

@ -1,6 +1,6 @@
/* /*
* Minosoft * Minosoft
* Copyright (C) 2020-2024 Moritz Zwerger * Copyright (C) 2020-2025 Moritz Zwerger
* *
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* *
@ -28,6 +28,7 @@ import de.bixilon.minosoft.gui.rendering.util.VecUtil.toVec3d
import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3dUtil.EMPTY
import de.bixilon.minosoft.protocol.network.session.play.PlaySession import de.bixilon.minosoft.protocol.network.session.play.PlaySession
import java.util.* import java.util.*
import kotlin.time.Duration.Companion.milliseconds
class MobSpawnerBlockEntity(session: PlaySession) : BlockEntity(session), BlockActionEntity { class MobSpawnerBlockEntity(session: PlaySession) : BlockEntity(session), BlockActionEntity {
private val smokeParticleType = session.registries.particleType[SmokeParticle] private val smokeParticleType = session.registries.particleType[SmokeParticle]
@ -36,7 +37,15 @@ class MobSpawnerBlockEntity(session: PlaySession) : BlockEntity(session), BlockA
private fun isPlayerInRange(blockPosition: Vec3i): Boolean { private fun isPlayerInRange(blockPosition: Vec3i): Boolean {
return session.world.entities.getInRadius(blockPosition.center, requiredPlayerRange.toDouble(), WorldEntities.CHECK_CLOSEST_PLAYER).isNotEmpty() val lock = session.world.entities.lock
if (!lock.acquire(10.milliseconds)) { // Deadlock workaround
return false
}
val inRadius = session.world.entities.getInRadius(blockPosition.center, requiredPlayerRange.toDouble(), WorldEntities.CHECK_CLOSEST_PLAYER).isNotEmpty()
lock.release()
return inRadius
} }
private fun spawnParticles(blockPosition: Vec3i, random: Random) { private fun spawnParticles(blockPosition: Vec3i, random: Random) {