From 8fc69cf3e36a564a04581f4db75ff076823bc5f2 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sat, 22 Oct 2022 00:11:30 +0700 Subject: [PATCH] Actually, DO use default endpoint in public synchronizer --- .../mc/otm/capability/MatteryPlayerCapability.kt | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt index 6eef0f2fa..99d5f5a1a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt @@ -83,10 +83,6 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial */ val publicSynchronizer = FieldSynchronizer() - init { - publicSynchronizer.defaultEndpoint.markUnused() - } - var hasExoSuit by publicSynchronizer.bool(name = "hasExoSuit") var displayExoSuit by publicSynchronizer.bool(true, name = "displayExoSuit") @@ -186,12 +182,6 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial // getting them unburied will be a very work intense task private val trackingPlayers = Reference2ObjectOpenHashMap() - init { - if (ply is ServerPlayer) { - trackingPlayers[ply] = publicSynchronizer.Endpoint() - } - } - val isEverAndroid: Boolean get() = isAndroid || willBecomeAndroid var lastJumpTicks = 14 @@ -693,6 +683,12 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, INBTSerial } } + val payload3 = publicSynchronizer.collectNetworkPayload() + + if (payload3 != null) { + MatteryPlayerNetworkChannel.send(ply, MatteryPlayerFieldPacket(payload3, true)) + } + if (networkQueue.size != 0) { for (packet in networkQueue) { MatteryPlayerNetworkChannel.send(ply, packet)