SET_AND_UPDATE redirected on USUALLY_TELEPORT.

MairwunNx · Feb 8, 2020 · 3358822 · 3358822
1 parent 7782c2b
commit 3358822
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 23 deletions.
diff --git a/src/main/kotlin/com/mairwunnx/randomteleport/commands/BadLocationCommand.kt b/src/main/kotlin/com/mairwunnx/randomteleport/commands/BadLocationCommand.kt
@@ -52,24 +52,15 @@ object BadLocationCommand {
                 )
 
                 when (ConfigurationManager.get().teleportStrategy) {
-                    USUALLY_TELEPORT, KEEP_LOADED, ATTEMPT_TELEPORT -> {
+                    USUALLY_TELEPORT, KEEP_LOADED, ATTEMPT_TELEPORT, SET_AND_UPDATE -> {
                         player.teleport(
                             position.x + getCenterPosBlock(),
                             position.y + getCenterPosBlock(),
                             position.z + getCenterPosBlock()
                         )
                     }
-                    SET_AND_UPDATE -> {
-                        player.setPositionAnglesAndUpdate(
-                            position.x + getCenterPosBlock(),
-                            position.y + getCenterPosBlock(),
-                            position.z + getCenterPosBlock(),
-                            player.yaw,
-                            player.pitch
-                        )
-                    }
                     SET_POSITION -> {
-                        player.setPosition(
+                        player.setPos(
                             position.x + getCenterPosBlock(),
                             position.y + getCenterPosBlock(),
                             position.z + getCenterPosBlock()

diff --git a/src/main/kotlin/com/mairwunnx/randomteleport/commands/RandomTeleportCommand.kt b/src/main/kotlin/com/mairwunnx/randomteleport/commands/RandomTeleportCommand.kt
@@ -187,24 +187,15 @@ object RandomTeleportCommand {
             TeleportRollbackManager.commitPosition(player.name.string, position)
 
             when (ConfigurationManager.get().teleportStrategy) {
-                USUALLY_TELEPORT, KEEP_LOADED, ATTEMPT_TELEPORT -> {
+                USUALLY_TELEPORT, KEEP_LOADED, ATTEMPT_TELEPORT, SET_AND_UPDATE -> {
                     player.teleport(
                         newPosition!!.x + getCenterPosBlock(),
                         newPosition!!.y + getCenterPosBlock(),
                         newPosition!!.z + getCenterPosBlock()
                     )
                 }
-                SET_AND_UPDATE -> {
-                    player.setPositionAnglesAndUpdate(
-                        newPosition!!.x + getCenterPosBlock(),
-                        newPosition!!.y + getCenterPosBlock(),
-                        newPosition!!.z + getCenterPosBlock(),
-                        player.yaw,
-                        player.pitch
-                    )
-                }
                 SET_POSITION -> {
-                    player.setPosition(
+                    player.setPos(
                         newPosition!!.x + getCenterPosBlock(),
                         newPosition!!.y + getCenterPosBlock(),
                         newPosition!!.z + getCenterPosBlock()

diff --git a/src/main/kotlin/com/mairwunnx/randomteleport/configuration/TeleportStrategy.kt b/src/main/kotlin/com/mairwunnx/randomteleport/configuration/TeleportStrategy.kt
@@ -7,7 +7,7 @@ import kotlinx.serialization.Serializable
 @Serializable
 enum class TeleportStrategy {
     USUALLY_TELEPORT,
-    SET_AND_UPDATE,
+    SET_AND_UPDATE, // For compatibility with fabric 1.14.4 configuration, just redirect on `USALLY_TELEPORT`.
     SET_POSITION,
     KEEP_LOADED, // For compatibility with forge configuration, just redirect on `USALLY_TELEPORT`.
     ATTEMPT_TELEPORT // For compatibility with forge configuration, just redirect on `USALLY_TELEPORT`.