mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-31 01:23:44 +01:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			6.10.1
			...
			fix/v6/imp
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 199bb1c9a2 | 
| @@ -18,6 +18,7 @@ | |||||||
|  */ |  */ | ||||||
| package com.plotsquared.bukkit.listener; | package com.plotsquared.bukkit.listener; | ||||||
|  |  | ||||||
|  | import com.google.common.collect.Iterables; | ||||||
| import com.plotsquared.bukkit.player.BukkitPlayer; | import com.plotsquared.bukkit.player.BukkitPlayer; | ||||||
| import com.plotsquared.bukkit.util.BukkitUtil; | import com.plotsquared.bukkit.util.BukkitUtil; | ||||||
| import com.plotsquared.core.location.Location; | import com.plotsquared.core.location.Location; | ||||||
| @@ -38,11 +39,8 @@ public class ForceFieldListener { | |||||||
|  |  | ||||||
|     private static Set<PlotPlayer<?>> getNearbyPlayers(Player player, Plot plot) { |     private static Set<PlotPlayer<?>> getNearbyPlayers(Player player, Plot plot) { | ||||||
|         Set<PlotPlayer<?>> players = new HashSet<>(); |         Set<PlotPlayer<?>> players = new HashSet<>(); | ||||||
|         for (Player nearPlayer : player.getNearbyEntities(5d, 5d, 5d).stream() |         for (Player nearPlayer : Iterables | ||||||
|                 .filter(entity -> entity instanceof Player) |                 .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) { | ||||||
|                 .map(entity -> (Player) entity) |  | ||||||
|                 .toList() |  | ||||||
|         ) { |  | ||||||
|             PlotPlayer<?> plotPlayer; |             PlotPlayer<?> plotPlayer; | ||||||
|             if ((plotPlayer = BukkitUtil.adapt(nearPlayer)) == null || !plot |             if ((plotPlayer = BukkitUtil.adapt(nearPlayer)) == null || !plot | ||||||
|                     .equals(plotPlayer.getCurrentPlot())) { |                     .equals(plotPlayer.getCurrentPlot())) { | ||||||
| @@ -56,11 +54,8 @@ public class ForceFieldListener { | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     private static PlotPlayer<?> hasNearbyPermitted(Player player, Plot plot) { |     private static PlotPlayer<?> hasNearbyPermitted(Player player, Plot plot) { | ||||||
|         for (Player nearPlayer : player.getNearbyEntities(5d, 5d, 5d).stream() |         for (Player nearPlayer : Iterables | ||||||
|                 .filter(entity -> entity instanceof Player) |                 .filter(player.getNearbyEntities(5d, 5d, 5d), Player.class)) { | ||||||
|                 .map(entity -> (Player) entity) |  | ||||||
|                 .toList() |  | ||||||
|         ) { |  | ||||||
|             PlotPlayer<?> plotPlayer; |             PlotPlayer<?> plotPlayer; | ||||||
|             if ((plotPlayer = BukkitUtil.adapt(nearPlayer)) == null || !plot |             if ((plotPlayer = BukkitUtil.adapt(nearPlayer)) == null || !plot | ||||||
|                     .equals(plotPlayer.getCurrentPlot())) { |                     .equals(plotPlayer.getCurrentPlot())) { | ||||||
|   | |||||||
| @@ -126,7 +126,6 @@ public class Buy extends Command { | |||||||
|                 plot.removeFlag(event.getFlag()); |                 plot.removeFlag(event.getFlag()); | ||||||
|             } |             } | ||||||
|             plot.setOwner(player.getUUID()); |             plot.setOwner(player.getUUID()); | ||||||
|             plot.getPlotModificationManager().setSign(player.getName()); |  | ||||||
|             player.sendMessage( |             player.sendMessage( | ||||||
|                     TranslatableCaption.of("working.claimed"), |                     TranslatableCaption.of("working.claimed"), | ||||||
|                     Template.of("plot", plot.getId().toString()) |                     Template.of("plot", plot.getId().toString()) | ||||||
|   | |||||||
| @@ -181,7 +181,6 @@ public class Download extends SubCommand { | |||||||
|                         schematicHandler.upload(compoundTag, null, null, new RunnableVal<>() { |                         schematicHandler.upload(compoundTag, null, null, new RunnableVal<>() { | ||||||
|                             @Override |                             @Override | ||||||
|                             public void run(URL value) { |                             public void run(URL value) { | ||||||
|                                 plot.removeRunning(); |  | ||||||
|                                 player.sendMessage( |                                 player.sendMessage( | ||||||
|                                         TranslatableCaption.of("web.generation_link_success"), |                                         TranslatableCaption.of("web.generation_link_success"), | ||||||
|                                         Template.of("download", value.toString()), |                                         Template.of("download", value.toString()), | ||||||
|   | |||||||
| @@ -26,7 +26,6 @@ import com.plotsquared.core.util.task.RunnableVal2; | |||||||
| import com.plotsquared.core.util.task.RunnableVal3; | import com.plotsquared.core.util.task.RunnableVal3; | ||||||
| import net.kyori.adventure.text.minimessage.Template; | import net.kyori.adventure.text.minimessage.Template; | ||||||
|  |  | ||||||
| import java.util.List; |  | ||||||
| import java.util.concurrent.CompletableFuture; | import java.util.concurrent.CompletableFuture; | ||||||
|  |  | ||||||
| @CommandDeclaration(command = "near", | @CommandDeclaration(command = "near", | ||||||
| @@ -49,13 +48,9 @@ public class Near extends Command { | |||||||
|         final Plot plot = check(player.getCurrentPlot(), TranslatableCaption.of("errors.not_in_plot")); |         final Plot plot = check(player.getCurrentPlot(), TranslatableCaption.of("errors.not_in_plot")); | ||||||
|         player.sendMessage( |         player.sendMessage( | ||||||
|                 TranslatableCaption.of("near.plot_near"), |                 TranslatableCaption.of("near.plot_near"), | ||||||
|                 Template.of("list", StringMan.join(getPlayersInPlotVisible(plot, player), ", ")) |                 Template.of("list", StringMan.join(plot.getPlayersInPlot(), ", ")) | ||||||
|         ); |         ); | ||||||
|         return CompletableFuture.completedFuture(true); |         return CompletableFuture.completedFuture(true); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     private List<PlotPlayer<?>> getPlayersInPlotVisible(Plot plot, PlotPlayer<?> executor) { |  | ||||||
|         return plot.getPlayersInPlot().stream().filter(executor::canSee).toList(); |  | ||||||
|     } |  | ||||||
|  |  | ||||||
| } | } | ||||||
|   | |||||||
| @@ -457,7 +457,7 @@ public class Plot { | |||||||
|      * that could alter the de facto owner of the plot. |      * that could alter the de facto owner of the plot. | ||||||
|      * |      * | ||||||
|      * @return The plot owner of this particular (sub-)plot |      * @return The plot owner of this particular (sub-)plot | ||||||
|      *         as stored in the database, if one exists. Else, null. |      * as stored in the database, if one exists. Else, null. | ||||||
|      */ |      */ | ||||||
|     public @Nullable UUID getOwnerAbs() { |     public @Nullable UUID getOwnerAbs() { | ||||||
|         return this.owner; |         return this.owner; | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ plugins { | |||||||
| } | } | ||||||
|  |  | ||||||
| group = "com.plotsquared" | group = "com.plotsquared" | ||||||
| version = "6.10.1" | version = "6.10.1-SNAPSHOT" | ||||||
|  |  | ||||||
| subprojects { | subprojects { | ||||||
|     group = rootProject.group |     group = rootProject.group | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user