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

Remove log warnings because events gonna repeat anyway

Browse Source
This commit is contained in:
DBotThePony 2022-09-30 09:49:02 +07:00
parent 653a0e2b77
commit 63062862bf
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
View File

@ -141,8 +141,6 @@ public final class OverdriveThatMatters {
EVENT_BUS.addListener(EventPriority.NORMAL, SynchronizedBlockEntity.Companion::onWatch); EVENT_BUS.addListener(EventPriority.NORMAL, SynchronizedBlockEntity.Companion::onWatch);
EVENT_BUS.addListener(EventPriority.NORMAL, SynchronizedBlockEntity.Companion::onForget); EVENT_BUS.addListener(EventPriority.NORMAL, SynchronizedBlockEntity.Companion::onForget);
EVENT_BUS.addListener(EventPriority.NORMAL, SynchronizedBlockEntity.Companion::playerDisconnected); EVENT_BUS.addListener(EventPriority.NORMAL, SynchronizedBlockEntity.Companion::playerDisconnected);
EVENT_BUS.addListener(EventPriority.NORMAL, SynchronizedBlockEntity.Companion::playerChangeDimensions);
EVENT_BUS.addListener(EventPriority.NORMAL, SynchronizedBlockEntity.Companion::playerCloneEvent);
MatteryPlayerNetworkChannel.INSTANCE.register(); MatteryPlayerNetworkChannel.INSTANCE.register();
MenuNetworkChannel.INSTANCE.register(); MenuNetworkChannel.INSTANCE.register();

17
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/SynchronizedBlockEntity.kt
View File

@ -187,7 +187,6 @@ abstract class SynchronizedBlockEntity(p_155228_: BlockEntityType<*>, p_155229_:
* [net.minecraft.server.level.ChunkMap.getPlayers], which is not something we want * [net.minecraft.server.level.ChunkMap.getPlayers], which is not something we want
*/ */
companion object { companion object {
private val LOGGER = LogManager.getLogger()
private val playerMap = WeakHashMap<Level, Long2ObjectAVLTreeMap<Subscribers>>() private val playerMap = WeakHashMap<Level, Long2ObjectAVLTreeMap<Subscribers>>()
fun onServerStopping(event: ServerStoppingEvent) { fun onServerStopping(event: ServerStoppingEvent) {
@ -202,9 +201,7 @@ abstract class SynchronizedBlockEntity(p_155228_: BlockEntityType<*>, p_155229_:
playerMap.computeIfAbsent(event.level) { Long2ObjectAVLTreeMap() }.computeIfAbsent(event.pos.toLong(), Long2ObjectFunction { Subscribers(level = WeakReference(event.level), chunkPos = event.pos.toLong()) }).let { playerMap.computeIfAbsent(event.level) { Long2ObjectAVLTreeMap() }.computeIfAbsent(event.pos.toLong(), Long2ObjectFunction { Subscribers(level = WeakReference(event.level), chunkPos = event.pos.toLong()) }).let {
val (blocks, players) = it val (blocks, players) = it
if (event.player in players) { if (event.player !in players) {
LOGGER.error("Player ${event.player} started 'watching' chunk ${event.chunk} more than once.")
} else {
players.add(event.player) players.add(event.player)
it.changeset++ it.changeset++
} }
@ -212,7 +209,7 @@ abstract class SynchronizedBlockEntity(p_155228_: BlockEntityType<*>, p_155229_:
} }
fun onForget(event: ChunkWatchEvent.UnWatch) { fun onForget(event: ChunkWatchEvent.UnWatch) {
val subs = playerMap.get(event.level)?.get(event.pos.toLong()) ?: return LOGGER.error("Player ${event.player} stopped 'watching' chunk at ${event.pos} before starting to watch it/stopped 'watching' more than once.") val subs = playerMap.get(event.level)?.get(event.pos.toLong()) ?: return
if (subs.players.remove(event.player)) { if (subs.players.remove(event.player)) {
if (subs.isEmpty) { if (subs.isEmpty) {
@ -220,8 +217,6 @@ abstract class SynchronizedBlockEntity(p_155228_: BlockEntityType<*>, p_155229_:
} else { } else {
subs.changeset++ subs.changeset++
} }
} else {
LOGGER.error("Player ${event.player} stopped 'watching' chunk at ${event.pos} before starting to watch it/stopped 'watching' more than once.")
} }
} }
@ -245,13 +240,5 @@ abstract class SynchronizedBlockEntity(p_155228_: BlockEntityType<*>, p_155229_:
} }
} }
} }
fun playerChangeDimensions(event: PlayerChangedDimensionEvent) {
}
fun playerCloneEvent(event: PlayerEvent.Clone) {
}
} }
} }