refactor: remove MovePlayerPacket.TeleportationCause from EntityTelep…

…ortEvent.Reason
AllayMC · Dec 26, 2024 · 29f33c9 · 29f33c9
1 parent f5d76f9
commit 29f33c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/api/src/main/java/org/allaymc/api/eventbus/event/entity/EntityTeleportEvent.java b/api/src/main/java/org/allaymc/api/eventbus/event/entity/EntityTeleportEvent.java
@@ -7,7 +7,6 @@
 import org.allaymc.api.eventbus.event.CancellableEvent;
 import org.allaymc.api.math.location.Location3f;
 import org.allaymc.api.math.location.Location3fc;
-import org.cloudburstmc.protocol.bedrock.packet.MovePlayerPacket;
 
 /**
  * @author daoge_cmd
@@ -35,14 +34,12 @@ public boolean isTeleportBetweenWorlds() {
     @AllArgsConstructor
     public enum Reason {
         // Unknown reason, may be caused by plugin
-        UNKNOWN(MovePlayerPacket.TeleportationCause.UNKNOWN),
+        UNKNOWN,
         // Ender pearl
-        PROJECTILE(MovePlayerPacket.TeleportationCause.PROJECTILE),
+        PROJECTILE,
         // Chorus fruit
-        CHORUS_FRUIT(MovePlayerPacket.TeleportationCause.CHORUS_FRUIT),
+        CHORUS_FRUIT,
         // Command
-        COMMAND(MovePlayerPacket.TeleportationCause.COMMAND);
-
-        private final MovePlayerPacket.TeleportationCause networkValue;
+        COMMAND;
     }
 }
diff --git a/...c/main/java/org/allaymc/server/entity/component/player/EntityPlayerBaseComponentImpl.java b/...c/main/java/org/allaymc/server/entity/component/player/EntityPlayerBaseComponentImpl.java
@@ -616,10 +616,19 @@ public void sendLocationToSelf(EntityTeleportEvent.Reason reason) {
         pk.setPosition(org.cloudburstmc.math.vector.Vector3f.from(location.x(), location.y() + getBaseOffset(), location.z()));
         pk.setRotation(org.cloudburstmc.math.vector.Vector3f.from(location.pitch(), location.yaw(), location.headYaw()));
         pk.setMode(MovePlayerPacket.Mode.TELEPORT);
-        pk.setTeleportationCause(reason.getNetworkValue());
+        pk.setTeleportationCause(convertTeleportReasonToNetworkCause(reason));
         networkComponent.sendPacket(pk);
     }
 
+    protected static MovePlayerPacket.TeleportationCause convertTeleportReasonToNetworkCause(EntityTeleportEvent.Reason reason) {
+        return switch (reason) {
+            case PROJECTILE -> MovePlayerPacket.TeleportationCause.PROJECTILE;
+            case CHORUS_FRUIT -> MovePlayerPacket.TeleportationCause.CHORUS_FRUIT;
+            case COMMAND -> MovePlayerPacket.TeleportationCause.COMMAND;
+            default -> MovePlayerPacket.TeleportationCause.UNKNOWN;
+        };
+    }
+
     @Override
     public boolean isUsingItemInAir() {
         return getMetadata().get(EntityFlag.USING_ITEM);