DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Chunk resubscription? for broken mods

Browse Source
This commit is contained in:
DBotThePony 2024-01-13 11:42:36 +07:00
parent c07120a1cb
commit 1f47f51157
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/MatteryBlockEntity.kt
View File

@ -35,6 +35,7 @@ import net.minecraftforge.event.entity.player.PlayerEvent
import net.minecraftforge.event.level.ChunkWatchEvent import net.minecraftforge.event.level.ChunkWatchEvent
import net.minecraftforge.event.level.LevelEvent import net.minecraftforge.event.level.LevelEvent
import net.minecraftforge.event.server.ServerStoppingEvent import net.minecraftforge.event.server.ServerStoppingEvent
import org.apache.logging.log4j.LogManager
import ru.dbotthepony.mc.otm.SERVER_IS_LIVE import ru.dbotthepony.mc.otm.SERVER_IS_LIVE
import ru.dbotthepony.mc.otm.block.INeighbourChangeListener import ru.dbotthepony.mc.otm.block.INeighbourChangeListener
import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
@ -660,6 +661,10 @@ abstract class MatteryBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: Bloc
if (players.add(player)) { if (players.add(player)) {
veto.add(player) veto.add(player)
recheckPlayer(player) recheckPlayer(player)
} else if (player !in veto) {
LOGGER.warn("Player got subscribed to ${ChunkPos(chunkPos)} multiple times without unsubscribing, forcefully resubscribing")
unsubscribe(player)
subscribe(player)
} }
} }
@ -734,6 +739,7 @@ abstract class MatteryBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: Bloc
private val tickingMap = WeakHashMap<ServerLevel, WeakHashSet<ChunkSubscribers>>() private val tickingMap = WeakHashMap<ServerLevel, WeakHashSet<ChunkSubscribers>>()
private val vec2Dir = Int2ObjectOpenHashMap<Direction>() private val vec2Dir = Int2ObjectOpenHashMap<Direction>()
private val LOGGER = LogManager.getLogger()
/** /**
* Returns stream of players watching (tracking) specified [chunkPos] in [level] * Returns stream of players watching (tracking) specified [chunkPos] in [level]