mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-20 21:23:44 +02:00 
			
		
		
		
	Compare commits
	
		
			2 Commits
		
	
	
		
			fix/v7/faw
			...
			fix/out-of
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 6e668cd862 | ||
|   | b51eec279f | 
| @@ -32,6 +32,7 @@ import com.plotsquared.core.plot.PlotWeather; | ||||
| import com.plotsquared.core.plot.world.PlotAreaManager; | ||||
| import com.plotsquared.core.util.EventDispatcher; | ||||
| import com.plotsquared.core.util.MathMan; | ||||
| import com.plotsquared.core.util.WorldUtil; | ||||
| import com.sk89q.worldedit.bukkit.BukkitAdapter; | ||||
| import com.sk89q.worldedit.extension.platform.Actor; | ||||
| import com.sk89q.worldedit.world.item.ItemType; | ||||
| @@ -120,6 +121,9 @@ public class BukkitPlayer extends PlotPlayer<Player> { | ||||
|  | ||||
|     @Override | ||||
|     public boolean canTeleport(final @NonNull Location location) { | ||||
|         if (!WorldUtil.isValidLocation(location)) { | ||||
|             return false; | ||||
|         } | ||||
|         final org.bukkit.Location to = BukkitUtil.adapt(location); | ||||
|         final org.bukkit.Location from = player.getLocation(); | ||||
|         PlayerTeleportEvent event = new PlayerTeleportEvent(player, from, to); | ||||
| @@ -221,7 +225,7 @@ public class BukkitPlayer extends PlotPlayer<Player> { | ||||
|  | ||||
|     @Override | ||||
|     public void teleport(final @NonNull Location location, final @NonNull TeleportCause cause) { | ||||
|         if (Math.abs(location.getX()) >= 30000000 || Math.abs(location.getZ()) >= 30000000) { | ||||
|         if (!WorldUtil.isValidLocation(location)) { | ||||
|             return; | ||||
|         } | ||||
|         final org.bukkit.Location bukkitLocation = | ||||
|   | ||||
| @@ -268,6 +268,7 @@ public class MainCommand extends Command { | ||||
|                     tp = true; | ||||
|                 } else { | ||||
|                     player.sendMessage(TranslatableCaption.of("border.denied")); | ||||
|                     return CompletableFuture.completedFuture(false); | ||||
|                 } | ||||
|                 // Trim command | ||||
|                 args = Arrays.copyOfRange(args, 1, args.length); | ||||
|   | ||||
| @@ -2574,6 +2574,12 @@ public class Plot { | ||||
|      */ | ||||
|     public void teleportPlayer(final PlotPlayer<?> player, TeleportCause cause, Consumer<Boolean> resultConsumer) { | ||||
|         Plot plot = this.getBasePlot(false); | ||||
|         if (!WorldUtil.isValidLocation(plot.getBottomAbs())) { | ||||
|             // prevent from teleporting into unsafe regions | ||||
|             player.sendMessage(TranslatableCaption.of("border.denied")); | ||||
|             resultConsumer.accept(false); | ||||
|             return; | ||||
|         } | ||||
|  | ||||
|         PlayerTeleportToPlotEvent event = this.eventDispatcher.callTeleport(player, player.getLocation(), plot, cause); | ||||
|         if (event.getEventResult() == Result.DENY) { | ||||
|   | ||||
| @@ -62,6 +62,15 @@ import java.util.zip.ZipOutputStream; | ||||
|  | ||||
| public abstract class WorldUtil { | ||||
|  | ||||
|     /** | ||||
|      * {@return whether the given location is valid in the world} | ||||
|      * @param location the location to check | ||||
|      * @since TODO | ||||
|      */ | ||||
|     public static boolean isValidLocation(Location location) { | ||||
|         return Math.abs(location.getX()) < 30000000 && Math.abs(location.getZ()) < 30000000; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Set the biome in a region | ||||
|      * | ||||
|   | ||||
		Reference in New Issue
	
	Block a user