mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-25 07:33:44 +02:00 
			
		
		
		
	Compare commits
	
		
			28 Commits
		
	
	
		
			feature/ba
			...
			fix/v7/sin
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 6ee0e5c4b1 | ||
|   | 82f868ae7d | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | e46dbd826c | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 809ddce2b3 | ||
|   | 1b40cea51f | ||
|   | 022e0fc224 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | b32137a650 | ||
|   | 17c41c0494 | ||
|   | 1ee76bf2d9 | ||
|   | 2321831044 | ||
|   | 25e98618b9 | ||
|   | 5344efd1b7 | ||
|   | 68701b6201 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 64c610ef37 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 931bb90600 | ||
|   | 1dfa3b4e66 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 8f236a56a6 | ||
|   | e51121960d | ||
|   | cc011de032 | ||
|   | 28298ffdd6 | ||
|   | 499d3c39bc | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 3d56937f14 | ||
|   | 0f1c2cb4e4 | ||
|   | 7b233c944a | ||
|   | d9537ee9df | ||
|   | 0de6887526 | ||
|   | a2e3274215 | ||
|   | b369683b9c | 
							
								
								
									
										7
									
								
								.github/ISSUE_TEMPLATE/bug_report.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.github/ISSUE_TEMPLATE/bug_report.yml
									
									
									
									
										vendored
									
									
								
							| @@ -30,14 +30,7 @@ body: | ||||
|         - '1.20.4' | ||||
|         - '1.20' | ||||
|         - '1.19.4' | ||||
|         - '1.19.3' | ||||
|         - '1.19.2' | ||||
|         - '1.19.1' | ||||
|         - '1.19' | ||||
|         - '1.18.2' | ||||
|         - '1.18.1' | ||||
|         - '1.17.1' | ||||
|         - '1.16.5' | ||||
|     validations: | ||||
|       required: true | ||||
|  | ||||
|   | ||||
							
								
								
									
										1
									
								
								.github/renovate.json
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/renovate.json
									
									
									
									
										vendored
									
									
								
							| @@ -9,7 +9,6 @@ | ||||
|     "dependencies" | ||||
|   ], | ||||
|   "rebaseWhen": "conflicted", | ||||
|   "schedule": ["on the first day of the month"], | ||||
|   "ignoreDeps": [ | ||||
|     "com.google.code.gson:gson", | ||||
|     "com.google.guava:guava", | ||||
|   | ||||
							
								
								
									
										2
									
								
								.github/workflows/label-merge-conflicts.yaml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/label-merge-conflicts.yaml
									
									
									
									
										vendored
									
									
								
							| @@ -15,7 +15,7 @@ jobs: | ||||
|     runs-on: ubuntu-latest | ||||
|     steps: | ||||
|       - name: Label conflicting PRs | ||||
|         uses: eps1lon/actions-label-merge-conflict@v2.1.0 | ||||
|         uses: eps1lon/actions-label-merge-conflict@v3.0.0 | ||||
|         with: | ||||
|           dirtyLabel: "unresolved-merge-conflict" | ||||
|           repoToken: "${{ secrets.GITHUB_TOKEN }}" | ||||
|   | ||||
| @@ -779,7 +779,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl | ||||
|                 Iterator<Entity> iterator = entities.iterator(); | ||||
|                 while (iterator.hasNext()) { | ||||
|                     Entity entity = iterator.next(); | ||||
|                     if (PaperLib.isPaper() && "CUSTOM".equals(entity.getEntitySpawnReason().name())) { | ||||
|                     //noinspection ConstantValue - getEntitySpawnReason annotated as NotNull, but is not NotNull. lol. | ||||
|                     if (PaperLib.isPaper() && entity.getEntitySpawnReason() != null && "CUSTOM".equals(entity.getEntitySpawnReason().name())) { | ||||
|                         continue; | ||||
|                     } | ||||
|                     // Fallback for Spigot not having Entity#getEntitySpawnReason | ||||
|   | ||||
| @@ -670,7 +670,11 @@ public class BlockEventListener implements Listener { | ||||
|                 BlockBreakEvent call = new BlockBreakEvent(block, player); | ||||
|                 Bukkit.getServer().getPluginManager().callEvent(call); | ||||
|                 if (!call.isCancelled()) { | ||||
|                     event.getBlock().breakNaturally(); | ||||
|                     if (Settings.Flags.INSTABREAK_CONSIDER_TOOL) { | ||||
|                         block.breakNaturally(event.getItemInHand()); | ||||
|                     } else { | ||||
|                         block.breakNaturally(); | ||||
|                     } | ||||
|                 } | ||||
|             } | ||||
|             // == rather than <= as we only care about the "ground level" not being destroyed | ||||
|   | ||||
| @@ -56,6 +56,7 @@ import org.bukkit.entity.Player; | ||||
| import org.bukkit.entity.Projectile; | ||||
| import org.bukkit.entity.TNTPrimed; | ||||
| import org.bukkit.entity.Vehicle; | ||||
| import org.bukkit.event.Cancellable; | ||||
| import org.bukkit.event.EventHandler; | ||||
| import org.bukkit.event.EventPriority; | ||||
| import org.bukkit.event.Listener; | ||||
| @@ -98,37 +99,25 @@ public class EntityEventListener implements Listener { | ||||
|  | ||||
|     @EventHandler(priority = EventPriority.HIGHEST) | ||||
|     public void onEntityCombustByEntity(EntityCombustByEntityEvent event) { | ||||
|         EntityDamageByEntityEvent eventChange = | ||||
|                 new EntityDamageByEntityEvent( | ||||
|                         event.getCombuster(), | ||||
|                         event.getEntity(), | ||||
|                         EntityDamageEvent.DamageCause.FIRE_TICK, | ||||
|                         event.getDuration() | ||||
|                 ); | ||||
|         onEntityDamageByEntityEvent(eventChange); | ||||
|         if (eventChange.isCancelled()) { | ||||
|             event.setCancelled(true); | ||||
|         } | ||||
|         onEntityDamageByEntityCommon(event.getCombuster(), event.getEntity(), EntityDamageEvent.DamageCause.FIRE_TICK, event); | ||||
|     } | ||||
|  | ||||
|     @EventHandler(priority = EventPriority.HIGHEST) | ||||
|     public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) { | ||||
|         Entity damager = event.getDamager(); | ||||
|         onEntityDamageByEntityCommon(event.getDamager(), event.getEntity(), event.getCause(), event); | ||||
|     } | ||||
|  | ||||
|     private void onEntityDamageByEntityCommon( | ||||
|             final Entity damager, | ||||
|             final Entity victim, | ||||
|             final EntityDamageEvent.DamageCause cause, | ||||
|             final Cancellable event | ||||
|     ) { | ||||
|         Location location = BukkitUtil.adapt(damager.getLocation()); | ||||
|         if (!this.plotAreaManager.hasPlotArea(location.getWorldName())) { | ||||
|             return; | ||||
|         } | ||||
|         Entity victim = event.getEntity(); | ||||
| /* | ||||
|         if (victim.getType().equals(EntityType.ITEM_FRAME)) { | ||||
|             Plot plot = BukkitUtil.getLocation(victim).getPlot(); | ||||
|             if (plot != null && !plot.isAdded(damager.getUniqueId())) { | ||||
|                 event.setCancelled(true); | ||||
|                 return; | ||||
|             } | ||||
|         } | ||||
| */ | ||||
|         if (!BukkitEntityUtil.entityDamage(damager, victim, event.getCause())) { | ||||
|         if (!BukkitEntityUtil.entityDamage(damager, victim, cause)) { | ||||
|             if (event.isCancelled()) { | ||||
|                 if (victim instanceof Ageable ageable) { | ||||
|                     if (ageable.getAge() == -24000) { | ||||
| @@ -163,13 +152,13 @@ public class EntityEventListener implements Listener { | ||||
|             } | ||||
|             case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL", | ||||
|                     "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL", | ||||
|                     "DUPLICATION", "FROZEN", "SPELL", "DEFAULT" -> { | ||||
|                     "FROZEN", "SPELL", "DEFAULT" -> { | ||||
|                 if (!area.isMobSpawning()) { | ||||
|                     event.setCancelled(true); | ||||
|                     return; | ||||
|                 } | ||||
|             } | ||||
|             case "BREEDING" -> { | ||||
|             case "BREEDING", "DUPLICATION" -> { | ||||
|                 if (!area.isSpawnBreeding()) { | ||||
|                     event.setCancelled(true); | ||||
|                     return; | ||||
|   | ||||
| @@ -124,7 +124,8 @@ public class EntitySpawnListener implements Listener { | ||||
|             return; | ||||
|         } | ||||
|         if (PaperLib.isPaper()) { | ||||
|             if (area.isSpawnCustom() && "CUSTOM".equals(entity.getEntitySpawnReason().name())) { | ||||
|             //noinspection ConstantValue - getEntitySpawnReason annotated as NotNull, but is not NotNull. lol. | ||||
|             if (area.isSpawnCustom() && entity.getEntitySpawnReason() != null && "CUSTOM".equals(entity.getEntitySpawnReason().name())) { | ||||
|                 return; | ||||
|             } | ||||
|         } | ||||
|   | ||||
| @@ -19,6 +19,7 @@ | ||||
| package com.plotsquared.bukkit.listener; | ||||
|  | ||||
| import com.destroystokyo.paper.event.block.BeaconEffectEvent; | ||||
| import com.destroystokyo.paper.event.block.BlockDestroyEvent; | ||||
| import com.destroystokyo.paper.event.entity.EntityPathfindEvent; | ||||
| import com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent; | ||||
| import com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent; | ||||
| @@ -40,7 +41,9 @@ import com.plotsquared.core.plot.PlotArea; | ||||
| import com.plotsquared.core.plot.flag.FlagContainer; | ||||
| import com.plotsquared.core.plot.flag.implementations.BeaconEffectsFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.DoneFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.FishingFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.TileDropFlag; | ||||
| import com.plotsquared.core.plot.flag.types.BooleanFlag; | ||||
| import com.plotsquared.core.plot.world.PlotAreaManager; | ||||
| import com.plotsquared.core.util.PlotFlagUtil; | ||||
| @@ -83,6 +86,19 @@ public class PaperListener implements Listener { | ||||
|         this.plotAreaManager = plotAreaManager; | ||||
|     } | ||||
|  | ||||
|     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) | ||||
|     public void onBlockDestroy(final BlockDestroyEvent event) { | ||||
|         Location location = BukkitUtil.adapt(event.getBlock().getLocation()); | ||||
|         PlotArea area = location.getPlotArea(); | ||||
|         if (area == null) { | ||||
|             return; | ||||
|         } | ||||
|         Plot plot = area.getPlot(location); | ||||
|         if (plot != null) { | ||||
|             event.setWillDrop(plot.getFlag(TileDropFlag.class)); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     @EventHandler | ||||
|     public void onEntityPathfind(EntityPathfindEvent event) { | ||||
|         if (!Settings.Paper_Components.ENTITY_PATHING) { | ||||
| @@ -348,6 +364,11 @@ public class PaperListener implements Listener { | ||||
|                 event.setCancelled(true); | ||||
|             } | ||||
|         } else if (!plot.isAdded(pp.getUUID())) { | ||||
|             if (entity.getType().equals(EntityType.FISHING_HOOK)) { | ||||
|                 if (plot.getFlag(FishingFlag.class)) { | ||||
|                     return; | ||||
|                 } | ||||
|             } | ||||
|             if (!plot.getFlag(ProjectilesFlag.class)) { | ||||
|                 if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) { | ||||
|                     pp.sendMessage( | ||||
|   | ||||
| @@ -61,6 +61,7 @@ import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.PlayerInteractFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.PreventCreativeCopyFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.TamedInteractFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.TileDropFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.UntrustedVisitFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.VehicleBreakFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.VehicleUseFlag; | ||||
| @@ -107,6 +108,7 @@ import org.bukkit.event.EventHandler; | ||||
| import org.bukkit.event.EventPriority; | ||||
| import org.bukkit.event.Listener; | ||||
| import org.bukkit.event.block.Action; | ||||
| import org.bukkit.event.block.BlockBreakEvent; | ||||
| import org.bukkit.event.entity.EntityPickupItemEvent; | ||||
| import org.bukkit.event.entity.EntityPlaceEvent; | ||||
| import org.bukkit.event.entity.EntityPotionEffectEvent; | ||||
| @@ -236,6 +238,19 @@ public class PlayerEventListener implements Listener { | ||||
|         this.plotListener = plotListener; | ||||
|     } | ||||
|  | ||||
|     @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) | ||||
|     public void onBlockBreak(final BlockBreakEvent event) { | ||||
|         Location location = BukkitUtil.adapt(event.getBlock().getLocation()); | ||||
|         PlotArea area = location.getPlotArea(); | ||||
|         if (area == null) { | ||||
|             return; | ||||
|         } | ||||
|         Plot plot = area.getPlot(location); | ||||
|         if (plot != null) { | ||||
|             event.setDropItems(plot.getFlag(TileDropFlag.class)); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) | ||||
|     public void onPlayerDyeSign(PlayerInteractEvent event) { | ||||
|         ItemStack itemStack = event.getItem(); | ||||
|   | ||||
| @@ -28,12 +28,14 @@ import com.plotsquared.core.player.PlotPlayer; | ||||
| import com.plotsquared.core.plot.Plot; | ||||
| import com.plotsquared.core.plot.PlotArea; | ||||
| import com.plotsquared.core.plot.PlotHandler; | ||||
| import com.plotsquared.core.plot.flag.implementations.FishingFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag; | ||||
| import com.plotsquared.core.plot.world.PlotAreaManager; | ||||
| import com.plotsquared.core.util.PlotFlagUtil; | ||||
| import net.kyori.adventure.text.minimessage.tag.Tag; | ||||
| import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; | ||||
| import org.bukkit.entity.Entity; | ||||
| import org.bukkit.entity.EntityType; | ||||
| import org.bukkit.entity.LivingEntity; | ||||
| import org.bukkit.entity.Player; | ||||
| import org.bukkit.entity.Projectile; | ||||
| @@ -132,6 +134,11 @@ public class ProjectileEventListener implements Listener { | ||||
|                 event.setCancelled(true); | ||||
|             } | ||||
|         } else if (!plot.isAdded(pp.getUUID())) { | ||||
|             if (entity.getType().equals(EntityType.FISHING_HOOK)) { | ||||
|                 if (plot.getFlag(FishingFlag.class)) { | ||||
|                     return; | ||||
|                 } | ||||
|             } | ||||
|             if (!plot.getFlag(ProjectilesFlag.class)) { | ||||
|                 if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) { | ||||
|                     pp.sendMessage( | ||||
| @@ -187,7 +194,8 @@ public class ProjectileEventListener implements Listener { | ||||
|                 return; | ||||
|             } | ||||
|             if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag( | ||||
|                     ProjectilesFlag.class)) { | ||||
|                     ProjectilesFlag.class) || (entity.getType().equals(EntityType.FISHING_HOOK) && plot.getFlag( | ||||
|                     FishingFlag.class))) { | ||||
|                 return; | ||||
|             } | ||||
|             entity.remove(); | ||||
|   | ||||
| @@ -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 = | ||||
|   | ||||
| @@ -20,7 +20,6 @@ package com.plotsquared.core.command; | ||||
|  | ||||
| import com.google.inject.Inject; | ||||
| import com.plotsquared.core.configuration.Settings; | ||||
| import com.plotsquared.core.configuration.caption.StaticCaption; | ||||
| import com.plotsquared.core.configuration.caption.TranslatableCaption; | ||||
| import com.plotsquared.core.permissions.Permission; | ||||
| import com.plotsquared.core.player.PlotPlayer; | ||||
| @@ -202,7 +201,6 @@ public class Download extends SubCommand { | ||||
|                                                     .tag("delete", Tag.preProcessParsed("Not available")) | ||||
|                                                     .build() | ||||
|                                     ); | ||||
|                                     player.sendMessage(StaticCaption.of(value.toString())); | ||||
|                                 } | ||||
|                             } | ||||
|                     )); | ||||
|   | ||||
| @@ -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); | ||||
|   | ||||
| @@ -77,6 +77,7 @@ public class Visit extends Command { | ||||
|             query.whereBasePlot(); | ||||
|         } | ||||
|  | ||||
|         // without specified argument | ||||
|         if (page == Integer.MIN_VALUE) { | ||||
|             page = 1; | ||||
|         } | ||||
| @@ -94,10 +95,15 @@ public class Visit extends Command { | ||||
|  | ||||
|         final List<Plot> plots = query.asList(); | ||||
|  | ||||
|         // Conversion of reversed page argument | ||||
|         if (page < 0) { | ||||
|             page = (plots.size() + 1) + page; | ||||
|         } | ||||
|  | ||||
|         if (plots.isEmpty()) { | ||||
|             player.sendMessage(TranslatableCaption.of("invalid.found_no_plots")); | ||||
|             return; | ||||
|         } else if (plots.size() < page || page < 1) { | ||||
|         } else if (page > plots.size() || page < 1) { | ||||
|             player.sendMessage( | ||||
|                     TranslatableCaption.of("invalid.number_not_in_range"), | ||||
|                     TagResolver.builder() | ||||
| @@ -188,34 +194,22 @@ public class Visit extends Command { | ||||
|         int page = Integer.MIN_VALUE; | ||||
|  | ||||
|         switch (args.length) { | ||||
|             // /p v <user> <area> <page> | ||||
|             // /p v <player> <area> <page> | ||||
|             case 3: | ||||
|                 if (!MathMan.isInteger(args[2])) { | ||||
|                     player.sendMessage( | ||||
|                             TranslatableCaption.of("invalid.not_valid_number"), | ||||
|                             TagResolver.resolver("value", Tag.inserting(Component.text("(1, ∞)"))) | ||||
|                     ); | ||||
|                     player.sendMessage( | ||||
|                             TranslatableCaption.of("commandconfig.command_syntax"), | ||||
|                             TagResolver.resolver("value", Tag.inserting(Component.text(getUsage()))) | ||||
|                     ); | ||||
|                 if (isInvalidPageNr(args[2])) { | ||||
|                     sendInvalidPageNrMsg(player); | ||||
|                     return CompletableFuture.completedFuture(false); | ||||
|                 } | ||||
|                 page = Integer.parseInt(args[2]); | ||||
|                 // /p v <name> <area> [page] | ||||
|                 // /p v <name> [page] | ||||
|                 page = getPageNr(args[2]); | ||||
|                 // /p v <player> <area> [page] | ||||
|                 // /p v <player> [page] | ||||
|             case 2: | ||||
|                 if (page != Integer.MIN_VALUE || !MathMan.isInteger(args[1])) { | ||||
|                 // If "case 3" is already through or the argument is not a page number: | ||||
|                 // -> /p v <player> <area> [page] | ||||
|                 if (page != Integer.MIN_VALUE || isInvalidPageNr(args[1])) { | ||||
|                     sortByArea = this.plotAreaManager.getPlotAreaByString(args[1]); | ||||
|                     if (sortByArea == null) { | ||||
|                         player.sendMessage( | ||||
|                                 TranslatableCaption.of("invalid.not_valid_number"), | ||||
|                                 TagResolver.resolver("value", Tag.inserting(Component.text("(1, ∞)"))) | ||||
|                         ); | ||||
|                         player.sendMessage( | ||||
|                                 TranslatableCaption.of("commandconfig.command_syntax"), | ||||
|                                 TagResolver.resolver("value", Tag.inserting(Component.text(getUsage()))) | ||||
|                         ); | ||||
|                         sendInvalidPageNrMsg(player); | ||||
|                         return CompletableFuture.completedFuture(false); | ||||
|                     } | ||||
|  | ||||
| @@ -249,16 +243,13 @@ public class Visit extends Command { | ||||
|                     }); | ||||
|                     break; | ||||
|                 } | ||||
|                 try { | ||||
|                     page = Integer.parseInt(args[1]); | ||||
|                 } catch (NumberFormatException ignored) { | ||||
|                     player.sendMessage( | ||||
|                             TranslatableCaption.of("invalid.not_a_number"), | ||||
|                             TagResolver.resolver("value", Tag.inserting(Component.text(args[1]))) | ||||
|                     ); | ||||
|                 // -> /p v <player> <page> | ||||
|                 if (isInvalidPageNr(args[1])) { | ||||
|                     sendInvalidPageNrMsg(player); | ||||
|                     return CompletableFuture.completedFuture(false); | ||||
|                 } | ||||
|                 // /p v <name> [page] | ||||
|                 page = getPageNr(args[1]); | ||||
|                 // /p v <player> [page] | ||||
|                 // /p v <uuid> [page] | ||||
|                 // /p v <plot> [page] | ||||
|                 // /p v <alias> | ||||
| @@ -326,6 +317,35 @@ public class Visit extends Command { | ||||
|         return CompletableFuture.completedFuture(true); | ||||
|     } | ||||
|  | ||||
|     private boolean isInvalidPageNr(String arg) { | ||||
|         if (MathMan.isInteger(arg)) { | ||||
|             return false; | ||||
|         } else if (arg.equals("last") || arg.equals("n")) { | ||||
|             return false; | ||||
|         } | ||||
|         return true; | ||||
|     } | ||||
|  | ||||
|     private int getPageNr(String arg) { | ||||
|         if (MathMan.isInteger(arg)) { | ||||
|             return Integer.parseInt(arg); | ||||
|         } else if (arg.equals("last") || arg.equals("n")) { | ||||
|             return -1; | ||||
|         } | ||||
|         return Integer.MIN_VALUE; | ||||
|     } | ||||
|  | ||||
|     private void sendInvalidPageNrMsg(PlotPlayer<?> player) { | ||||
|         player.sendMessage( | ||||
|                 TranslatableCaption.of("invalid.not_valid_number"), | ||||
|                 TagResolver.resolver("value", Tag.inserting(Component.text("(1, ∞)"))) | ||||
|         ); | ||||
|         player.sendMessage( | ||||
|                 TranslatableCaption.of("commandconfig.command_syntax"), | ||||
|                 TagResolver.resolver("value", Tag.inserting(Component.text(getUsage()))) | ||||
|         ); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public Collection<Command> tab(PlotPlayer<?> player, String[] args, boolean space) { | ||||
|         final List<Command> completions = new ArrayList<>(); | ||||
| @@ -334,6 +354,7 @@ public class Visit extends Command { | ||||
|             case 1 -> { | ||||
|                 completions.addAll( | ||||
|                         TabCompletions.completeAreas(args[1])); | ||||
|                 completions.addAll(TabCompletions.asCompletions("last")); | ||||
|                 if (args[1].isEmpty()) { | ||||
|                     // if no input is given, only suggest 1 - 3 | ||||
|                     completions.addAll( | ||||
| @@ -344,6 +365,7 @@ public class Visit extends Command { | ||||
|                         TabCompletions.completeNumbers(args[1], 10, 999)); | ||||
|             } | ||||
|             case 2 -> { | ||||
|                 completions.addAll(TabCompletions.asCompletions("last")); | ||||
|                 if (args[2].isEmpty()) { | ||||
|                     // if no input is given, only suggest 1 - 3 | ||||
|                     completions.addAll( | ||||
|   | ||||
| @@ -723,6 +723,12 @@ public class Settings extends Config { | ||||
|  | ||||
|     } | ||||
|  | ||||
|     @Comment("Settings related to flags") | ||||
|     public static final class Flags { | ||||
|  | ||||
|         @Comment("If \"instabreak\" should consider the used tool.") | ||||
|         public static boolean INSTABREAK_CONSIDER_TOOL = false; | ||||
|     } | ||||
|  | ||||
|     @Comment({"Enable or disable parts of the plugin", | ||||
|             "Note: A cache will use some memory if enabled"}) | ||||
|   | ||||
| @@ -2574,6 +2574,12 @@ public class Plot { | ||||
|      */ | ||||
|     public void teleportPlayer(final PlotPlayer<?> player, TeleportCause cause, Consumer<Boolean> resultConsumer) { | ||||
|         Plot plot = this.getBasePlot(false); | ||||
|         if ((getArea() == null || !(getArea() instanceof SinglePlotArea)) && !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) { | ||||
|   | ||||
| @@ -1455,7 +1455,7 @@ public abstract class PlotArea implements ComponentLike { | ||||
|     /** | ||||
|      * Get the maximum height that changes to plot components (wall filling, air, all etc.) may operate to | ||||
|      * | ||||
|      * @since TODO | ||||
|      * @since 7.3.4 | ||||
|      */ | ||||
|     public int getMaxComponentHeight() { | ||||
|         return this.maxBuildHeight; | ||||
| @@ -1464,7 +1464,7 @@ public abstract class PlotArea implements ComponentLike { | ||||
|     /** | ||||
|      * Get the minimum height that changes to plot components (wall filling, air, all etc.) may operate to | ||||
|      * | ||||
|      * @since TODO | ||||
|      * @since 7.3.4 | ||||
|      */ | ||||
|     public int getMinComponentHeight() { | ||||
|         return this.minBuildHeight; | ||||
|   | ||||
| @@ -48,6 +48,7 @@ import com.plotsquared.core.plot.flag.implementations.EntityChangeBlockFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.ExplosionFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.FarewellFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.FeedFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.FishingFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.FlyFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.ForcefieldFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.GamemodeFlag; | ||||
| @@ -101,6 +102,7 @@ import com.plotsquared.core.plot.flag.implementations.SnowMeltFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.SoilDryFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.TamedAttackFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.TamedInteractFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.TileDropFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.TimeFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.TitlesFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.UntrustedVisitFlag; | ||||
| @@ -158,6 +160,7 @@ public final class GlobalFlagContainer extends FlagContainer { | ||||
|         this.addFlag(EditSignFlag.EDIT_SIGN_FALSE); | ||||
|         this.addFlag(EntityChangeBlockFlag.ENTITY_CHANGE_BLOCK_FALSE); | ||||
|         this.addFlag(ExplosionFlag.EXPLOSION_FALSE); | ||||
|         this.addFlag(FishingFlag.FISHING_FALSE); | ||||
|         this.addFlag(ForcefieldFlag.FORCEFIELD_FALSE); | ||||
|         this.addFlag(GrassGrowFlag.GRASS_GROW_TRUE); | ||||
|         this.addFlag(HangingBreakFlag.HANGING_BREAK_FALSE); | ||||
| @@ -196,6 +199,7 @@ public final class GlobalFlagContainer extends FlagContainer { | ||||
|         this.addFlag(SoilDryFlag.SOIL_DRY_FALSE); | ||||
|         this.addFlag(TamedAttackFlag.TAMED_ATTACK_FALSE); | ||||
|         this.addFlag(TamedInteractFlag.TAMED_INTERACT_FALSE); | ||||
|         this.addFlag(TileDropFlag.TILE_DROP_TRUE); | ||||
|         this.addFlag(UntrustedVisitFlag.UNTRUSTED_VISIT_FLAG_TRUE); | ||||
|         this.addFlag(VehicleBreakFlag.VEHICLE_BREAK_FALSE); | ||||
|         this.addFlag(VehiclePlaceFlag.VEHICLE_PLACE_FALSE); | ||||
|   | ||||
| @@ -0,0 +1,39 @@ | ||||
| /* | ||||
|  * PlotSquared, a land and world management plugin for Minecraft. | ||||
|  * Copyright (C) IntellectualSites <https://intellectualsites.com> | ||||
|  * Copyright (C) IntellectualSites team and contributors | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  * the Free Software Foundation, either version 3 of the License, or | ||||
|  * (at your option) any later version. | ||||
|  * | ||||
|  * This program is distributed in the hope that it will be useful, | ||||
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|  * GNU General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU General Public License | ||||
|  * along with this program.  If not, see <https://www.gnu.org/licenses/>. | ||||
|  */ | ||||
| package com.plotsquared.core.plot.flag.implementations; | ||||
|  | ||||
| import com.plotsquared.core.configuration.caption.TranslatableCaption; | ||||
| import com.plotsquared.core.plot.flag.types.BooleanFlag; | ||||
| import org.checkerframework.checker.nullness.qual.NonNull; | ||||
|  | ||||
| public class FishingFlag extends BooleanFlag<FishingFlag> { | ||||
|  | ||||
|     public static final FishingFlag FISHING_TRUE = new FishingFlag(true); | ||||
|     public static final FishingFlag FISHING_FALSE = new FishingFlag(false); | ||||
|  | ||||
|     private FishingFlag(boolean value) { | ||||
|         super(value, TranslatableCaption.of("flags.flag_description_fishing")); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     protected FishingFlag flagOf(@NonNull final Boolean value) { | ||||
|         return value ? FISHING_TRUE : FISHING_FALSE; | ||||
|     } | ||||
|  | ||||
| } | ||||
| @@ -0,0 +1,43 @@ | ||||
| /* | ||||
|  * PlotSquared, a land and world management plugin for Minecraft. | ||||
|  * Copyright (C) IntellectualSites <https://intellectualsites.com> | ||||
|  * Copyright (C) IntellectualSites team and contributors | ||||
|  * | ||||
|  * This program is free software: you can redistribute it and/or modify | ||||
|  * it under the terms of the GNU General Public License as published by | ||||
|  * the Free Software Foundation, either version 3 of the License, or | ||||
|  * (at your option) any later version. | ||||
|  * | ||||
|  * This program is distributed in the hope that it will be useful, | ||||
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|  * GNU General Public License for more details. | ||||
|  * | ||||
|  * You should have received a copy of the GNU General Public License | ||||
|  * along with this program.  If not, see <https://www.gnu.org/licenses/>. | ||||
|  */ | ||||
| package com.plotsquared.core.plot.flag.implementations; | ||||
|  | ||||
| import com.plotsquared.core.configuration.caption.TranslatableCaption; | ||||
| import com.plotsquared.core.plot.flag.types.BooleanFlag; | ||||
| import org.checkerframework.checker.nullness.qual.NonNull; | ||||
|  | ||||
| /** | ||||
|  * @since TODO | ||||
|  */ | ||||
|  | ||||
| public class TileDropFlag extends BooleanFlag<TileDropFlag> { | ||||
|  | ||||
|     public static final TileDropFlag TILE_DROP_TRUE = new TileDropFlag(true); | ||||
|     public static final TileDropFlag TILE_DROP_FALSE = new TileDropFlag(false); | ||||
|  | ||||
|     private TileDropFlag(boolean value) { | ||||
|         super(value, TranslatableCaption.of("flags.flag_description_tile_drop")); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     protected TileDropFlag flagOf(@NonNull Boolean value) { | ||||
|         return value ? TILE_DROP_TRUE : TILE_DROP_FALSE; | ||||
|     } | ||||
|  | ||||
| } | ||||
| @@ -37,7 +37,7 @@ import java.util.List; | ||||
|  | ||||
| public class SinglePlotManager extends PlotManager { | ||||
|  | ||||
|     private static final int MAX_COORDINATE = 30000000; | ||||
|     private static final int MAX_COORDINATE = 20000000; | ||||
|  | ||||
|     public SinglePlotManager(final @NonNull PlotArea plotArea) { | ||||
|         super(plotArea); | ||||
|   | ||||
| @@ -551,6 +551,7 @@ public class EventDispatcher { | ||||
|                             ) | ||||
|                     ); | ||||
|                 } | ||||
|                 return false; | ||||
|             } | ||||
|             default -> { | ||||
|             } | ||||
|   | ||||
| @@ -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 7.3.6 | ||||
|      */ | ||||
|     public static boolean isValidLocation(Location location) { | ||||
|         return Math.abs(location.getX()) < 30000000 && Math.abs(location.getZ()) < 30000000; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Set the biome in a region | ||||
|      * | ||||
|   | ||||
| @@ -559,6 +559,7 @@ | ||||
|   "flags.flag_description_drop_protection": "<gray>Set to `true` to prevent dropped items from being picked up by non-members of the plot.</gray>", | ||||
|   "flags.flag_description_edit_sign": "<gray>Set to `true` to allow editing signs in the plot.</gray>", | ||||
|   "flags.flag_description_feed": "<gray>Specify an interval in seconds and an optional amount by which the players will be fed (amount is 1 by default).</gray>", | ||||
|   "flags.flag_description_fishing": "<gray>Set to `true` to allow guests to use a fishing rod in the plot.</gray>", | ||||
|   "flags.flag_description_forcefield": "<gray>Set to `true` to enable member forcefield in the plot.</gray>", | ||||
|   "flags.flag_description_grass_grow": "<gray>Set to `false` to prevent grass from growing within the plot.</gray>", | ||||
|   "flags.flag_description_hanging_break": "<gray>Set to `true` to allow guests to break hanging objects in the plot.</gray>", | ||||
| @@ -605,6 +606,7 @@ | ||||
|   "flags.flag_description_tamed_attack": "<gray>Set to `true` to allow guests to attack tamed animals in the plot.</gray>", | ||||
|   "flags.flag_description_tamed_interact": "<gray>Set to `true` to allow guests to interact with tamed animals in the plot.</gray>", | ||||
|   "flags.flag_description_time": "<gray>Set the time in the plot to a fixed value.</gray>", | ||||
|   "flags.flag_description_tile_drop": "<gray>Set to `false` to prevent blocks from dropping items in the plot.</gray>", | ||||
|   "flags.flag_description_titles": "<gray>Set to `false` to disable plot titles. Can be set to: `none` (to inherit world settings), `true`, or `false`</gray>", | ||||
|   "flags.flag_description_title": "<gray>Set the pop-up title's title and subtitle. Format: /plot flag set title \"A title\" \"The subtitle\"</gray>", | ||||
|   "flags.flag_description_use": "<gray>Define a list of materials players should be able to interact with in the plot.</gray>", | ||||
|   | ||||
| @@ -22,7 +22,7 @@ plugins { | ||||
| } | ||||
|  | ||||
| group = "com.intellectualsites.plotsquared" | ||||
| version = "7.3.4-SNAPSHOT" | ||||
| version = "7.3.7-SNAPSHOT" | ||||
|  | ||||
| if (!File("$rootDir/.git").exists()) { | ||||
|     logger.lifecycle(""" | ||||
| @@ -225,7 +225,7 @@ tasks.getByName<Jar>("jar") { | ||||
|     enabled = false | ||||
| } | ||||
|  | ||||
| val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1", "1.20.4") | ||||
| val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.1", "1.20.4") | ||||
| tasks { | ||||
|     register("cacheLatestFaweArtifact") { | ||||
|         val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL() | ||||
|   | ||||
| @@ -7,13 +7,13 @@ checkerqual = "3.42.0" | ||||
| gson = "2.10" | ||||
| guava = "31.1-jre" | ||||
| snakeyaml = "2.0" | ||||
| adventure = "4.15.0" | ||||
| adventure = "4.16.0" | ||||
| adventure-bukkit = "4.3.2" | ||||
| log4j = "2.19.0" | ||||
|  | ||||
| # Plugins | ||||
| worldedit = "7.2.18" | ||||
| fawe = "2.8.4" | ||||
| worldedit = "7.2.20" | ||||
| fawe = "2.9.1" | ||||
| placeholderapi = "2.11.5" | ||||
| luckperms = "5.4" | ||||
| essentialsx = "2.20.1" | ||||
|   | ||||
							
								
								
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								gradle/wrapper/gradle-wrapper.jar
									
									
									
									
										vendored
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							| @@ -1,6 +1,6 @@ | ||||
| distributionBase=GRADLE_USER_HOME | ||||
| distributionPath=wrapper/dists | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip | ||||
| networkTimeout=10000 | ||||
| validateDistributionUrl=true | ||||
| zipStoreBase=GRADLE_USER_HOME | ||||
|   | ||||
		Reference in New Issue
	
	Block a user