From 63062862bfdb41715ba397eb46dacd0669cce12a Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Fri, 30 Sep 2022 09:49:02 +0700 Subject: [PATCH] Remove log warnings because events gonna repeat anyway --- .../mc/otm/OverdriveThatMatters.java | 2 -- .../otm/block/entity/SynchronizedBlockEntity.kt | 17 ++--------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java index 7ceb21671..5fc9139cb 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java +++ b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java @@ -141,8 +141,6 @@ public final class OverdriveThatMatters { EVENT_BUS.addListener(EventPriority.NORMAL, SynchronizedBlockEntity.Companion::onWatch); EVENT_BUS.addListener(EventPriority.NORMAL, SynchronizedBlockEntity.Companion::onForget); 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(); MenuNetworkChannel.INSTANCE.register(); diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/SynchronizedBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/SynchronizedBlockEntity.kt index b837f7629..b56befaeb 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/SynchronizedBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/SynchronizedBlockEntity.kt @@ -187,7 +187,6 @@ abstract class SynchronizedBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: * [net.minecraft.server.level.ChunkMap.getPlayers], which is not something we want */ companion object { - private val LOGGER = LogManager.getLogger() private val playerMap = WeakHashMap>() 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 { val (blocks, players) = it - if (event.player in players) { - LOGGER.error("Player ${event.player} started 'watching' chunk ${event.chunk} more than once.") - } else { + if (event.player !in players) { players.add(event.player) it.changeset++ } @@ -212,7 +209,7 @@ abstract class SynchronizedBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: } 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.isEmpty) { @@ -220,8 +217,6 @@ abstract class SynchronizedBlockEntity(p_155228_: BlockEntityType<*>, p_155229_: } else { 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) { - - } } }