Use async teleport

Author: 0ffz

build.gradle.kts

@@ -21,6 +21,7 @@ repositories {
     maven("https://repo.mineinabyss.com/releases")
     maven("https://papermc.io/repo/repository/maven-public/") //Paper
     maven("https://repo.codemc.org/repository/maven-public/")
+//    maven("https://mvn.intellectualsites.com/content/repositories/releases/") // FAWE
     maven("https://jitpack.io")
 }
 
@@ -29,7 +30,7 @@ val kotlinVersion: String by project
 
 dependencies {
     compileOnly("com.destroystokyo.paper:paper-api:$serverVersion")
-    compileOnly("io.papermc:paperlib:1.0.6")
+//    compileOnly("com.intellectualsites.fawe:FAWE-Bukkit:1.16-637")
     compileOnly(kotlin("stdlib-jdk8"))
 
     kotlinSpice("$kotlinVersion+")
@@ -38,7 +39,7 @@ dependencies {
     compileOnly("nl.rutgerkok:blocklocker:1.9.2")
     compileOnly("com.comphenix.protocol:ProtocolLib:4.5.0")
 
-    implementation("com.mineinabyss:idofront:0.5.8")
+    implementation("com.mineinabyss:idofront:0.6.13")
 
     testImplementation("junit:junit:4.12")
 }
@@ -59,4 +60,4 @@ publishing {
     mineInAbyss(project) {
         from(components["java"])
     }
-}
+}

src/main/java/com/derongan/minecraft/deeperworld/extensions/DeeperWorldExtensions.kt

@@ -34,7 +34,7 @@ internal fun Player.getLeashedEntities(): List<LivingEntity> {
         .filter { it.isLeashed && it.leashHolder == this }
 }
 
-internal fun Player.teleportWithSpectator(loc: Location) {
+internal fun Player.teleportWithSpectatorsAsync(loc: Location, thenRun: (Boolean) -> Unit) {
     val nearbySpectators = getNearbyEntities(5.0, 5.0, 5.0)
         .filterIsInstance<Player>()
         .filter { it.spectatorTarget == this }
@@ -43,10 +43,12 @@ internal fun Player.teleportWithSpectator(loc: Location) {
         it.spectatorTarget = null
     }
 
-    teleport(loc)
-
-    nearbySpectators.forEach {
-        it.teleport(loc)
-        it.spectatorTarget = this
+    teleportAsync(loc).thenAccept { success ->
+        if (!success) return@thenAccept
+        nearbySpectators.forEach {
+            it.teleport(loc)
+            it.spectatorTarget = this
+        }
+        thenRun(success)
     }
-}
+}

src/main/java/com/derongan/minecraft/deeperworld/listeners/MovementListener.kt

@@ -12,13 +12,14 @@ import com.derongan.minecraft.deeperworld.event.PlayerDescendEvent
 import com.derongan.minecraft.deeperworld.extensions.getLeashedEntities
 import com.derongan.minecraft.deeperworld.extensions.getPassengersRecursive
 import com.derongan.minecraft.deeperworld.extensions.getRootVehicle
-import com.derongan.minecraft.deeperworld.extensions.teleportWithSpectator
+import com.derongan.minecraft.deeperworld.extensions.teleportWithSpectatorsAsync
 import com.derongan.minecraft.deeperworld.services.WorldManager
 import com.derongan.minecraft.deeperworld.services.canMoveSections
 import com.derongan.minecraft.deeperworld.world.section.*
 import com.mineinabyss.idofront.destructure.component1
 import com.mineinabyss.idofront.events.call
 import com.mineinabyss.idofront.messaging.color
+import com.mineinabyss.idofront.messaging.info
 import com.okkero.skedule.schedule
 import org.bukkit.GameMode
 import org.bukkit.Location
@@ -164,36 +165,37 @@ object MovementListener : Listener {
             deeperWorld.schedule {
                 waitFor(1)
 
-                player.teleportWithSpectator(newLoc)
-
-                protocolManager.addPacketListener(
-                    SectionTeleportPacketAdapter(
-                        player,
-                        oldLeashedEntities,
-                        oldFallDistance,
-                        oldVelocity,
-                        vehicleTree
+                player.teleportWithSpectatorsAsync(newLoc) {
+                    protocolManager.addPacketListener(
+                        SectionTeleportPacketAdapter(
+                            player,
+                            oldLeashedEntities,
+                            oldFallDistance,
+                            oldVelocity,
+                            vehicleTree
+                        )
                     )
-                )
+                }
+
             }
         } else {
             val oldFallDistance = player.fallDistance
             val oldVelocity = player.velocity
 
-            player.teleportWithSpectator(newLoc)
-
-            player.fallDistance = oldFallDistance
-            player.velocity = oldVelocity
-
-            if (oldLeashedEntities.isNotEmpty()) {
-                protocolManager.addPacketListener(
-                    SectionTeleportPacketAdapter(
-                        player,
-                        oldLeashedEntities,
-                        oldFallDistance,
-                        oldVelocity
+            player.teleportWithSpectatorsAsync(newLoc) {
+                player.fallDistance = oldFallDistance
+                player.velocity = oldVelocity
+
+                if (oldLeashedEntities.isNotEmpty()) {
+                    protocolManager.addPacketListener(
+                        SectionTeleportPacketAdapter(
+                            player,
+                            oldLeashedEntities,
+                            oldFallDistance,
+                            oldVelocity
+                        )
                     )
-                )
+                }
             }
         }
     }

src/main/java/com/derongan/minecraft/deeperworld/synchronization/ContainerSyncListener.kt

@@ -6,7 +6,6 @@ import com.derongan.minecraft.deeperworld.world.section.*
 import com.mineinabyss.idofront.destructure.component1
 import com.mineinabyss.idofront.messaging.color
 import com.mineinabyss.idofront.messaging.info
-import io.papermc.lib.PaperLib
 import nl.rutgerkok.blocklocker.BlockLockerAPIv2
 import nl.rutgerkok.blocklocker.SearchMode
 import org.bukkit.Chunk
@@ -39,11 +38,12 @@ object ContainerSyncListener : Listener {
         val loc = clicked.location
         val container = clicked.state
         val (player) = event
+
         if (container is Container && event.action == Action.RIGHT_CLICK_BLOCK && !player.isSneaking) {
             val section = loc.section ?: return
             val linkedSection = loc.correspondingSection ?: return
             val linkedBlock = loc.getCorrespondingLocation(section, linkedSection)?.block ?: return
-//            PaperLib.getBlockState()
+
             if (DeeperContext.isBlockLockerLoaded) {
                 updateProtection(linkedBlock)
                 updateProtection(clicked)

src/main/java/com/derongan/minecraft/deeperworld/synchronization/Updaters.kt

@@ -52,4 +52,4 @@ internal fun Collection<ItemStack?>.dropItems(loc: Location, noVelocity: Boolean
     filterNotNull().forEach {
         loc.world?.dropItem(spawnLoc, it).apply { if (noVelocity) this?.velocity = Vector(0, 0, 0) }
     }
-}
+}

src/main/java/com/derongan/minecraft/deeperworld/world/section/SectionUtils.kt

@@ -5,6 +5,8 @@ package com.derongan.minecraft.deeperworld.world.section
 
 import com.derongan.minecraft.deeperworld.MinecraftConstants
 import com.derongan.minecraft.deeperworld.services.WorldManager
+import com.mineinabyss.idofront.operators.minus
+import com.mineinabyss.idofront.operators.plus
 import org.bukkit.Location
 import kotlin.math.max
 import kotlin.math.min
@@ -57,8 +59,8 @@ fun Location.getCorrespondingLocation(sectionA: Section, sectionB: Section): Loc
 
     // fromX + n = toX
     // toX - fromX = n
-    val delta = toSectionLoc.toVector().subtract(fromSectionLoc.toVector())
-    val newLoc = clone().add(delta)
+    val delta = toSectionLoc.toVector() - (fromSectionLoc.toVector())
+    val newLoc = clone() + delta
     newLoc.world = sectionB.world
     return newLoc
 }
@@ -92,4 +94,4 @@ fun Section.overlapWith(other: Section): Int? {
 fun Section.isOnTopOf(other: Section) = key == other.aboveKey
 
 /** Whether a section is adjacent to another */
-fun Section.isAdjacentTo(other: Section) = this.isOnTopOf(other) || other.isOnTopOf(this)
+fun Section.isAdjacentTo(other: Section) = this.isOnTopOf(other) || other.isOnTopOf(this)