Improve interation and packet handling

gabber235 · Sep 11, 2024 · a2222f8 · a2222f8
1 parent 8cb2753
commit a2222f8
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 28 deletions.
diff --git a/engine/engine-paper/build.gradle.kts b/engine/engine-paper/build.gradle.kts
@@ -38,8 +38,8 @@ dependencies {
     api(project(":engine-loader"))
 
     api("me.tofaa.entitylib:spigot:2.4.9-SNAPSHOT")
-    api("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.17.0")
-    api("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.17.0")
+    api("com.github.shynixn.mccoroutine:mccoroutine-bukkit-api:2.19.0")
+    api("com.github.shynixn.mccoroutine:mccoroutine-bukkit-core:2.19.0")
     api("dev.jorel:commandapi-bukkit-shade:9.5.3")
     api("dev.jorel:commandapi-bukkit-kotlin:9.5.3")
 

diff --git a/...ine-paper/src/main/kotlin/com/typewritermc/engine/paper/interaction/InteractionHandler.kt b/...ine-paper/src/main/kotlin/com/typewritermc/engine/paper/interaction/InteractionHandler.kt
@@ -12,6 +12,7 @@ import com.typewritermc.engine.paper.plugin
 import com.typewritermc.engine.paper.snippets.snippet
 import com.typewritermc.engine.paper.utils.ThreadType.DISPATCHERS_ASYNC
 import kotlinx.coroutines.runBlocking
+import lirand.api.extensions.server.registerEvents
 import lirand.api.extensions.server.registerSuspendingEvents
 import lirand.api.extensions.server.server
 import org.bukkit.entity.Player
@@ -97,7 +98,7 @@ class InteractionHandler : Listener, KoinComponent {
     }
 
     fun initialize() {
-        plugin.registerSuspendingEvents(this)
+        plugin.registerEvents(this)
     }
 
     // When a player joins the server, we need to create an interaction for them.

diff --git a/...gine-paper/src/main/kotlin/com/typewritermc/engine/paper/interaction/PacketInterceptor.kt b/...gine-paper/src/main/kotlin/com/typewritermc/engine/paper/interaction/PacketInterceptor.kt
@@ -53,6 +53,13 @@ class PacketInterceptor : PacketListenerAbstract() {
         }
     }
 
+    fun cancel(player: UUID, bundle: InterceptionBundle) {
+        blockers.compute(player) { _, blocker ->
+            val newBlocker = blocker ?: return@compute null
+            if (newBlocker.cancel(bundle)) null else newBlocker
+        }
+    }
+
     fun shutdown() {
         PacketEvents.getAPI().eventManager.unregisterListener(this)
         blockers.clear()
@@ -75,6 +82,11 @@ private data class PlayerPacketInterceptor(
         return interceptions.isEmpty()
     }
 
+    fun cancel(bundle: InterceptionBundle): Boolean {
+        bundle.subscriptions.forEach { cancel(it) }
+        return interceptions.isEmpty()
+    }
+
     fun trigger(event: ProtocolPacketEvent) {
         interceptions.values
             .asSequence()
@@ -127,7 +139,7 @@ fun Player.interceptPackets(block: InterceptionBundle.() -> Unit): InterceptionB
 }
 
 class InterceptionBundle(private val playerId: UUID) {
-    private val subscriptions = mutableListOf<PacketInterceptionSubscription>()
+    internal val subscriptions = mutableListOf<PacketInterceptionSubscription>()
 
     private fun intercept(interception: PacketInterception) {
         val subscription = get<PacketInterceptor>(PacketInterceptor::class.java).interceptPacket(playerId, interception)
@@ -150,7 +162,6 @@ class InterceptionBundle(private val playerId: UUID) {
 
     fun cancel() {
         val interceptor = get<PacketInterceptor>(PacketInterceptor::class.java)
-        subscriptions.forEach { interceptor.cancel(playerId, it) }
-        subscriptions.clear()
+        interceptor.cancel(playerId, this)
     }
 }
diff --git a/engine/engine-paper/src/main/kotlin/com/typewritermc/engine/paper/utils/Extensions.kt b/engine/engine-paper/src/main/kotlin/com/typewritermc/engine/paper/utils/Extensions.kt
@@ -68,18 +68,6 @@ fun Audience.playSound(
 ) = playSound(Sound.sound(Key.key(sound), source, volume, pitch))
 
 
-val Player.isHighUp: Boolean
-    get() = this.location.isHighUp
-val Location.isHighUp: Boolean
-    get() = this.y >= highUpLocation.y
-
-val Location.highUpLocation: Location
-    get() {
-        val location = toHighestLocation()
-        location.y += 200
-        return location
-    }
-
 fun Location.distanceSqrt(other: Location): Double? {
     if (world != other.world) return null
     val dx = x - other.x
@@ -99,9 +87,6 @@ fun Location.lerp(other: Location, amount: Double): Location {
 val Location.up: Location
     get() = clone().apply { y += 1 }
 
-val Location.down: Location
-    get() = clone().apply { y -= 1 }
-
 val Location.firstWalkableLocationBelow: Location
     get() = clone().apply {
         while (block.isPassable) y--

diff --git a/...xtension/src/main/kotlin/com/typewritermc/basic/entries/cinematic/CameraCinematicEntry.kt b/...xtension/src/main/kotlin/com/typewritermc/basic/entries/cinematic/CameraCinematicEntry.kt
@@ -236,14 +236,15 @@ class CameraCinematicAction(
     private suspend fun Player.teardown() {
         listener?.unregister()
         listener = null
-        interceptor?.cancel()
-        interceptor = null
-        originalState?.let {
-            SYNC.switchContext {
+        SYNC.switchContext {
+            interceptor?.cancel()
+            interceptor = null
+
+            originalState?.let {
                 restore(it)
-                if (gameMode != GameMode.CREATIVE) {
-                    restoreInventory()
-                }
+            }
+            if (gameMode != GameMode.CREATIVE) {
+                restoreInventory()
             }
         }
         originalState = null