Avoid teleport out of spawnable bounds

Author: Doc94

paper-api/src/main/java/org/bukkit/event/entity/EntityTeleportEvent.java

@@ -44,8 +44,10 @@ public Location getFrom() {
      * Sets the location that this entity moved from
      *
      * @param from New location this entity moved from
+     * @throws IllegalArgumentException if the location is not finite
      */
     public void setFrom(@NotNull Location from) {
+        from.checkFinite();
         this.from = from.clone();
     }
 
@@ -63,9 +65,15 @@ public Location getTo() {
      * Sets the location that this entity moved to
      *
      * @param to New Location this entity moved to
+     * @throws IllegalArgumentException if the location is not finite
      */
     public void setTo(@Nullable Location to) {
-        this.to = to != null ? to.clone() : null;
+        if (to != null) {
+            to.checkFinite();
+            this.to = to.clone();
+        } else {
+            this.to = null;
+        }
     }
 
     @Override

paper-api/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java

@@ -53,7 +53,7 @@ public void setFrom(@NotNull Location from) {
      *
      * @return Location the player moved to
      */
-    @NotNull // Paper
+    @NotNull
     public Location getTo() {
         return to;
     }
@@ -139,7 +139,8 @@ public void setCancelled(boolean cancel) {
 
     private void validateLocation(@NotNull Location loc) {
         Preconditions.checkArgument(loc != null, "Cannot use null location!");
-        Preconditions.checkArgument(loc.getWorld() != null, "Cannot use null location with null world!");
+        Preconditions.checkArgument(loc.getWorld() != null, "Cannot use location with null world!");
+        loc.checkFinite();
     }
 
     @NotNull

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

@@ -27000,7 +27000,7 @@ index 704733ff5e558a12f2f9dde924ab4c507745595d..5e305c9a64e856de70ed787901c01d09
      }
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index a5bc4e8a3dde40c416c05e91dfec25bc7efdd013..66c25f323b9a19e25fcaea782dc72f477fd32629 100644
+index 50396c988e0c44ab4e04255c8c32281fbbfb2e95..657827b0342a12fc53d4197fa0ecbde5df1fce31 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -201,7 +201,7 @@ import net.minecraft.world.scores.Team;
@@ -28098,7 +28098,7 @@ index 8cc5c0716392ba06501542ff5cbe71ee43979e5d..09fd99c9cbd23b5f3c899bfb00c9b896
 +    // Paper end - block counting
  }
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index d5c38171be43b9a4a17e28889746f0c25e084176..1ca1a5b897a9a9375ccc9ca02e7ae77ee7ecddea 100644
+index 32be8212b28db5bb759a69498852a812f4c9aa04..5602df8a3214a2e672fb2e1abed4756a9e2aa9c5 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -149,7 +149,7 @@ import net.minecraft.world.waypoints.WaypointTransmitter;
@@ -28573,7 +28573,7 @@ index d5c38171be43b9a4a17e28889746f0c25e084176..1ca1a5b897a9a9375ccc9ca02e7ae77e
      }
 
      public InteractionResult interact(Player player, InteractionHand hand) {
-@@ -4298,15 +4535,17 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4297,15 +4534,17 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      }
 
      public Iterable<Entity> getIndirectPassengers() {
@@ -28599,7 +28599,7 @@ index d5c38171be43b9a4a17e28889746f0c25e084176..1ca1a5b897a9a9375ccc9ca02e7ae77e
      }
 
      public int countPlayerPassengers() {
-@@ -4449,77 +4688,126 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4448,77 +4687,126 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
          return Mth.lerp(partialTick, this.yRotO, this.yRot);
      }
 
@@ -28784,7 +28784,7 @@ index d5c38171be43b9a4a17e28889746f0c25e084176..1ca1a5b897a9a9375ccc9ca02e7ae77e
 
      public boolean touchingUnloadedChunk() {
          AABB aabb = this.getBoundingBox().inflate(1.0);
-@@ -4675,6 +4963,15 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4674,6 +4962,15 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      }
 
      public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
@@ -28800,7 +28800,7 @@ index d5c38171be43b9a4a17e28889746f0c25e084176..1ca1a5b897a9a9375ccc9ca02e7ae77e
          if (!checkPosition(this, x, y, z)) {
              return;
          }
-@@ -4826,6 +5123,12 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4825,6 +5122,12 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
 
      @Override
      public final void setRemoved(Entity.RemovalReason removalReason, @Nullable org.bukkit.event.entity.EntityRemoveEvent.Cause cause) { // CraftBukkit - add Bukkit remove cause
@@ -28813,7 +28813,7 @@ index d5c38171be43b9a4a17e28889746f0c25e084176..1ca1a5b897a9a9375ccc9ca02e7ae77e
          org.bukkit.craftbukkit.event.CraftEventFactory.callEntityRemoveEvent(this, cause); // CraftBukkit
          final boolean alreadyRemoved = this.removalReason != null; // Paper - Folia schedulers
          if (this.removalReason == null) {
-@@ -4836,7 +5139,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4835,7 +5138,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
              this.stopRiding();
          }
 
@@ -28822,7 +28822,7 @@ index d5c38171be43b9a4a17e28889746f0c25e084176..1ca1a5b897a9a9375ccc9ca02e7ae77e
          this.levelCallback.onRemove(removalReason);
          this.onRemoval(removalReason);
          // Paper start - Folia schedulers
-@@ -4870,7 +5173,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4869,7 +5172,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      public boolean shouldBeSaved() {
          return (this.removalReason == null || this.removalReason.shouldSave())
              && !this.isPassenger()

paper-server/patches/features/0026-Optimise-EntityScheduler-ticking.patch

@@ -67,10 +67,10 @@ index d5f3083354d70c4da3c39e2f909ce4c7e170295c..4b1ffb5396138fc0d165ac647797b83f
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.DIALOG_CLICK_MANAGER.handleQueue(this.tickCount); // Paper
          profilerFiller.push("commandFunctions");
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index fea14f27503369185c867d269c5b8b416ce76eda..80dce02ac088eccaff71ab7fa85516036177a804 100644
+index ad818ffb2565f137fb41b18bfcc28d9b80097074..de934ad9e1ef1712da9b2f7c376a17fde3540d97 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -5190,6 +5190,11 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -5189,6 +5189,11 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
          this.getBukkitEntity().taskScheduler.retire();
      }
      // Paper end - Folia schedulers

paper-server/patches/sources/net/minecraft/server/level/ServerPlayer.java.patch

@@ -750,26 +750,24 @@
          if (this.isRemoved()) {
              return null;
          } else {
-@@ -1084,13 +_,48 @@
+@@ -1084,13 +_,46 @@
 
              ServerLevel level = teleportTransition.newLevel();
              ServerLevel serverLevel = this.level();
 -            ResourceKey<Level> resourceKey = serverLevel.dimension();
 +            // CraftBukkit start
 +            ResourceKey<net.minecraft.world.level.dimension.LevelStem> resourceKey = serverLevel.getTypeKey();
 +
-+            org.bukkit.Location enter = this.getBukkitEntity().getLocation();
 +            PositionMoveRotation absolutePosition = PositionMoveRotation.calculateAbsolute(PositionMoveRotation.of(this), PositionMoveRotation.of(teleportTransition), teleportTransition.relatives());
 +            org.bukkit.Location exit = org.bukkit.craftbukkit.util.CraftLocation.toBukkit(absolutePosition.position(), level, absolutePosition.yRot(), absolutePosition.xRot());
 +            final org.bukkit.event.player.PlayerTeleportEvent tpEvent;
 +            // Paper start - gateway-specific teleport event
 +            if (this.portalProcess != null && this.portalProcess.isSamePortal(((net.minecraft.world.level.block.EndGatewayBlock) net.minecraft.world.level.block.Blocks.END_GATEWAY)) && this.level().getBlockEntity(this.portalProcess.getEntryPosition()) instanceof net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity theEndGatewayBlockEntity) {
-+                tpEvent = new com.destroystokyo.paper.event.player.PlayerTeleportEndGatewayEvent(this.getBukkitEntity(), enter, exit.clone(), new org.bukkit.craftbukkit.block.CraftEndGateway(this.level().getWorld(), theEndGatewayBlockEntity));
++                tpEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerTeleportEndGatewayEvent(this, exit.clone(), theEndGatewayBlockEntity);
 +            } else {
-+                tpEvent = new org.bukkit.event.player.PlayerTeleportEvent(this.getBukkitEntity(), enter, exit.clone(), teleportTransition.cause());
++                tpEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerTeleportEvent(this.getBukkitEntity(), this.getBukkitEntity().getLocation(), exit.clone(), teleportTransition.cause(), null);
 +            }
 +            // Paper end - gateway-specific teleport event
-+            org.bukkit.Bukkit.getServer().getPluginManager().callEvent(tpEvent);
 +            org.bukkit.Location newExit = tpEvent.getTo();
 +            if (tpEvent.isCancelled()) {
 +                return null;

paper-server/patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch

@@ -996,7 +996,7 @@
 
              return true;
          } else {
-@@ -1181,10 +_,77 @@
+@@ -1181,10 +_,76 @@
      }
 
      public void teleport(double x, double y, double z, float yRot, float xRot) {
@@ -1032,9 +1032,8 @@
 +            final io.papermc.paper.entity.TeleportFlag.Relative flag = org.bukkit.craftbukkit.entity.CraftEntity.deltaRelativeToAPI(relativeArgument);
 +            if (flag != null) relativeFlags.add(flag);
 +        }
-+        PlayerTeleportEvent event = new PlayerTeleportEvent(player, from.clone(), to.clone(), cause, java.util.Set.copyOf(relativeFlags));
++        PlayerTeleportEvent event = CraftEventFactory.callPlayerTeleportEvent(player, from.clone(), to.clone(), cause, java.util.Set.copyOf(relativeFlags));
 +        // Paper end - Teleport API
-+        this.cserver.getPluginManager().callEvent(event);
 +
 +        if (event.isCancelled() || !to.equals(event.getTo())) {
 +            relatives = Set.of(); // target pos is absolute

paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch

@@ -1463,7 +1463,7 @@
          try (ProblemReporter.ScopedCollector scopedCollector = new ProblemReporter.ScopedCollector(this.problemPath(), LOGGER)) {
              TagValueOutput tagValueOutput = TagValueOutput.createWithContext(scopedCollector, entity.registryAccess());
              entity.saveWithoutId(tagValueOutput);
-@@ -2935,7 +_,65 @@
+@@ -2935,7 +_,64 @@
 
      @Nullable
      public Entity teleport(TeleportTransition teleportTransition) {
@@ -1481,8 +1481,7 @@
 +            // Paper start - gateway-specific teleport event
 +            final org.bukkit.event.entity.EntityTeleportEvent teleEvent;
 +            if (this.portalProcess != null && this.portalProcess.isSamePortal(((net.minecraft.world.level.block.EndGatewayBlock) Blocks.END_GATEWAY)) && this.level.getBlockEntity(this.portalProcess.getEntryPosition()) instanceof net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity theEndGatewayBlockEntity) {
-+                teleEvent = new com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent(this.getBukkitEntity(), this.getBukkitEntity().getLocation(), to, new org.bukkit.craftbukkit.block.CraftEndGateway(to.getWorld(), theEndGatewayBlockEntity));
-+                teleEvent.callEvent();
++                teleEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTeleportEndGatewayEvent(this, to, theEndGatewayBlockEntity);
 +            } else {
 +                teleEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTeleportEvent(this, to);
 +            }

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java

@@ -288,9 +288,10 @@ public boolean teleport(Location location, TeleportCause cause) {
 
     @Override
     public boolean teleport(Location location, TeleportCause cause, TeleportFlag... flags) {
+        Preconditions.checkState(!this.entity.generation, "Cannot teleport entity to an other world during world generation");
         Preconditions.checkArgument(location != null, "location cannot be null");
         Preconditions.checkArgument(location.getWorld() != null, "Target world cannot be null");
-        Preconditions.checkState(!this.entity.generation, "Cannot teleport entity to an other world during world generation");
+        Preconditions.checkArgument(ServerLevel.isInSpawnableBounds(CraftLocation.toBlockPosition(location)), "location is out of spawnable bounds [x/z between %s and %s or y between %s and %s]", -ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MIN_ENTITY_SPAWN_Y, ServerLevel.MAX_ENTITY_SPAWN_Y);
         location.checkFinite();
 
         return this.teleport0(location, cause, flags);

paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java

@@ -1,5 +1,7 @@
 package org.bukkit.craftbukkit.event;
 
+import com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent;
+import com.destroystokyo.paper.event.player.PlayerTeleportEndGatewayEvent;
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
 import com.google.common.base.Preconditions;
@@ -9,6 +11,7 @@
 import io.papermc.paper.adventure.PaperAdventure;
 import io.papermc.paper.connection.HorriblePlayerLoginEventHack;
 import io.papermc.paper.connection.PlayerConnection;
+import io.papermc.paper.entity.TeleportFlag;
 import io.papermc.paper.event.connection.PlayerConnectionValidateLoginEvent;
 import io.papermc.paper.event.entity.ItemTransportingEntityValidateTargetEvent;
 import java.util.ArrayList;
@@ -63,6 +66,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.entity.SignBlockEntity;
+import net.minecraft.world.level.block.entity.TheEndGatewayBlockEntity;
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
 import net.minecraft.world.level.redstone.Redstone;
 import net.minecraft.world.level.storage.loot.LootContext;
@@ -103,6 +107,7 @@
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.craftbukkit.inventory.CraftItemType;
 import org.bukkit.craftbukkit.potion.CraftPotionUtil;
+import org.bukkit.craftbukkit.util.CraftLocation;
 import org.bukkit.craftbukkit.util.CraftNamespacedKey;
 import org.bukkit.craftbukkit.util.CraftVector;
 import org.bukkit.entity.AbstractHorse;
@@ -1932,6 +1937,38 @@ public static PlayerRecipeBookClickEvent callRecipeBookClickEvent(ServerPlayer p
         return event;
     }
 
+    public static PlayerTeleportEvent callPlayerTeleportEvent(Player player, Location from, Location to, PlayerTeleportEvent.TeleportCause cause, @Nullable Set<TeleportFlag.Relative> teleportFlags) {
+        PlayerTeleportEvent event;
+        if (teleportFlags == null) {
+            event = new PlayerTeleportEvent(player, from, to, cause);
+        } else {
+            event = new PlayerTeleportEvent(player, from, to, cause, teleportFlags);
+        }
+
+        event.callEvent();
+
+        Preconditions.checkArgument(ServerLevel.isInSpawnableBounds(CraftLocation.toBlockPosition(event.getFrom())), "origin for PlayerTeleportEvent is out of spawnable bounds [x/z between %s and %s or y between %s and %s]", -ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MIN_ENTITY_SPAWN_Y, ServerLevel.MAX_ENTITY_SPAWN_Y);
+        if (!event.isCancelled()) {
+            Preconditions.checkArgument(ServerLevel.isInSpawnableBounds(CraftLocation.toBlockPosition(event.getTo())), "destination for PlayerTeleportEvent is out of spawnable bounds [x/z between %s and %s or y between %s and %s]", -ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MIN_ENTITY_SPAWN_Y, ServerLevel.MAX_ENTITY_SPAWN_Y);
+        }
+
+        return event;
+    }
+
+    public static PlayerTeleportEndGatewayEvent callPlayerTeleportEndGatewayEvent(ServerPlayer nmsPlayer, Location to, TheEndGatewayBlockEntity nmsTheEndGatewayBlockEntity) {
+        CraftPlayer entity = nmsPlayer.getBukkitEntity();
+        PlayerTeleportEndGatewayEvent event = new PlayerTeleportEndGatewayEvent(entity, entity.getLocation(), to, new org.bukkit.craftbukkit.block.CraftEndGateway(nmsPlayer.level().getWorld(), nmsTheEndGatewayBlockEntity));
+
+        event.callEvent();
+
+        Preconditions.checkArgument(ServerLevel.isInSpawnableBounds(CraftLocation.toBlockPosition(event.getFrom())), "origin for PlayerTeleportEndGatewayEvent is out of spawnable bounds [x/z between %s and %s or y between %s and %s]", -ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MIN_ENTITY_SPAWN_Y, ServerLevel.MAX_ENTITY_SPAWN_Y);
+        if (!event.isCancelled()) {
+            Preconditions.checkArgument(ServerLevel.isInSpawnableBounds(CraftLocation.toBlockPosition(event.getTo())), "destination for PlayerTeleportEndGatewayEvent is out of spawnable bounds [x/z between %s and %s or y between %s and %s]", -ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MIN_ENTITY_SPAWN_Y, ServerLevel.MAX_ENTITY_SPAWN_Y);
+        }
+
+        return event;
+    }
+
     public static EntityTeleportEvent callEntityTeleportEvent(Entity nmsEntity, double x, double y, double z) {
         CraftEntity entity = nmsEntity.getBukkitEntity();
         Location to = new Location(entity.getWorld(), x, y, z, nmsEntity.getYRot(), nmsEntity.getXRot());
@@ -1942,7 +1979,26 @@ public static EntityTeleportEvent callEntityTeleportEvent(Entity nmsEntity, Loca
         CraftEntity entity = nmsEntity.getBukkitEntity();
         EntityTeleportEvent event = new org.bukkit.event.entity.EntityTeleportEvent(entity, entity.getLocation(), to);
 
-        Bukkit.getPluginManager().callEvent(event);
+        event.callEvent();
+
+        Preconditions.checkArgument(ServerLevel.isInSpawnableBounds(CraftLocation.toBlockPosition(event.getFrom())), "origin for EntityTeleportEvent is out of spawnable bounds [x/z between %s and %s or y between %s and %s]", -ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MIN_ENTITY_SPAWN_Y, ServerLevel.MAX_ENTITY_SPAWN_Y);
+        if (!event.isCancelled() && event.getTo() != null) {
+            Preconditions.checkArgument(ServerLevel.isInSpawnableBounds(CraftLocation.toBlockPosition(event.getTo())), "destination for EntityTeleportEvent is out of spawnable bounds [x/z between %s and %s or y between %s and %s]", -ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MIN_ENTITY_SPAWN_Y, ServerLevel.MAX_ENTITY_SPAWN_Y);
+        }
+
+        return event;
+    }
+
+    public static EntityTeleportEndGatewayEvent callEntityTeleportEndGatewayEvent(Entity nmsEntity, Location to, TheEndGatewayBlockEntity nmsTheEndGatewayBlockEntity) {
+        CraftEntity entity = nmsEntity.getBukkitEntity();
+        EntityTeleportEndGatewayEvent event = new com.destroystokyo.paper.event.entity.EntityTeleportEndGatewayEvent(entity, entity.getLocation(), to, new org.bukkit.craftbukkit.block.CraftEndGateway(to.getWorld(), nmsTheEndGatewayBlockEntity));
+
+        event.callEvent();
+
+        Preconditions.checkArgument(ServerLevel.isInSpawnableBounds(CraftLocation.toBlockPosition(event.getFrom())), "origin for EntityTeleportEndGatewayEvent is out of spawnable bounds [x/z between %s and %s or y between %s and %s]", -ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MIN_ENTITY_SPAWN_Y, ServerLevel.MAX_ENTITY_SPAWN_Y);
+        if (!event.isCancelled() && event.getTo() != null) {
+            Preconditions.checkArgument(ServerLevel.isInSpawnableBounds(CraftLocation.toBlockPosition(event.getTo())), "destination for EntityTeleportEndGatewayEvent is out of spawnable bounds [x/z between %s and %s or y between %s and %s]", -ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MAX_LEVEL_SIZE, ServerLevel.MIN_ENTITY_SPAWN_Y, ServerLevel.MAX_ENTITY_SPAWN_Y);
+        }
 
         return event;
     }