mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-11-04 03:03:43 +01:00 
			
		
		
		
	Compare commits
	
		
			49 Commits
		
	
	
		
			jdk14-21
			...
			fix/avoid-
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					e33f534c33 | ||
| 
						 | 
					7f1f1e025e | ||
| 
						 | 
					59787fe7f3 | ||
| 
						 | 
					6783d5ece6 | ||
| 
						 | 
					d9aa2a496c | ||
| 
						 | 
					809ed6778c | ||
| 
						 | 
					2fe44053a2 | ||
| 
						 | 
					c36b87ca14 | ||
| 
						 | 
					5aec7653b6 | ||
| 
						 | 
					cc5d01e225 | ||
| 
						 | 
					448577774a | ||
| 
						 | 
					966c878a72 | ||
| 
						 | 
					5021f5b379 | ||
| 
						 | 
					76ea9e0d3c | ||
| 
						 | 
					951f08bc8b | ||
| 
						 | 
					ae941e67a4 | ||
| 
						 | 
					9566af5fda | ||
| 
						 | 
					fccc146053 | ||
| 
						 | 
					a1d94af242 | ||
| 
						 | 
					6371cd4c5a | ||
| 
						 | 
					e4613cfc62 | ||
| 
						 | 
					8c44b2d2d2 | ||
| 
						 | 
					449af2f3a4 | ||
| 
						 | 
					ead7acdd76 | ||
| 
						 | 
					1991142d48 | ||
| 
						 | 
					63ae11b3d3 | ||
| 
						 | 
					86fe3c6846 | ||
| 
						 | 
					a90e179338 | ||
| 
						 | 
					a6ae287908 | ||
| 
						 | 
					1a33997099 | ||
| 
						 | 
					6edd4b8220 | ||
| 
						 | 
					9b0d1e484c | ||
| 
						 | 
					6971fa4c10 | ||
| 
						 | 
					3c818f3e33 | ||
| 
						 | 
					31be2e5eb3 | ||
| 
						 | 
					945a8ad306 | ||
| 
						 | 
					c6b0b99cd6 | ||
| 
						 | 
					dbfc43e3cd | ||
| 
						 | 
					c8b4a2fa39 | ||
| 
						 | 
					d851e27aed | ||
| 
						 | 
					4a45729c9e | ||
| 
						 | 
					7931c0864e | ||
| 
						 | 
					1456b29d93 | ||
| 
						 | 
					761477b76d | ||
| 
						 | 
					e61bcf905f | ||
| 
						 | 
					85bec710df | ||
| 
						 | 
					d130794453 | ||
| 
						 | 
					f5f875eb11 | ||
| 
						 | 
					89511f07f9 | 
							
								
								
									
										2
									
								
								.github/ISSUE_TEMPLATE/bug_report.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/ISSUE_TEMPLATE/bug_report.yml
									
									
									
									
										vendored
									
									
								
							@@ -27,7 +27,7 @@ body:
 | 
				
			|||||||
      description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
 | 
					      description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
 | 
				
			||||||
      multiple: false
 | 
					      multiple: false
 | 
				
			||||||
      options:
 | 
					      options:
 | 
				
			||||||
        - '1.20.2'
 | 
					        - '1.20.4'
 | 
				
			||||||
        - '1.20'
 | 
					        - '1.20'
 | 
				
			||||||
        - '1.19.4'
 | 
					        - '1.19.4'
 | 
				
			||||||
        - '1.19.3'
 | 
					        - '1.19.3'
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										7
									
								
								.github/workflows/build-pr.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.github/workflows/build-pr.yml
									
									
									
									
										vendored
									
									
								
							@@ -7,16 +7,15 @@ jobs:
 | 
				
			|||||||
    strategy:
 | 
					    strategy:
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
        os: [ ubuntu-latest, windows-latest, macos-latest ]
 | 
					        os: [ ubuntu-latest, windows-latest, macos-latest ]
 | 
				
			||||||
        jdk: [ 17, 21 ]
 | 
					 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - name: Checkout Repository
 | 
					      - name: Checkout Repository
 | 
				
			||||||
        uses: actions/checkout@v4
 | 
					        uses: actions/checkout@v4
 | 
				
			||||||
      - name: Validate Gradle Wrapper
 | 
					      - name: Validate Gradle Wrapper
 | 
				
			||||||
        uses: gradle/wrapper-validation-action@v1
 | 
					        uses: gradle/wrapper-validation-action@v2
 | 
				
			||||||
      - name: Setup Java ${{ matrix.jdk }}
 | 
					      - name: Setup Java
 | 
				
			||||||
        uses: actions/setup-java@v4
 | 
					        uses: actions/setup-java@v4
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          distribution: temurin
 | 
					          distribution: temurin
 | 
				
			||||||
          java-version: ${{ matrix.jdk }}
 | 
					          java-version: 17
 | 
				
			||||||
      - name: Clean Build
 | 
					      - name: Clean Build
 | 
				
			||||||
        run: ./gradlew clean build
 | 
					        run: ./gradlew clean build
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							@@ -11,7 +11,7 @@ jobs:
 | 
				
			|||||||
      - name: Checkout Repository
 | 
					      - name: Checkout Repository
 | 
				
			||||||
        uses: actions/checkout@v4
 | 
					        uses: actions/checkout@v4
 | 
				
			||||||
      - name: Validate Gradle Wrapper
 | 
					      - name: Validate Gradle Wrapper
 | 
				
			||||||
        uses: gradle/wrapper-validation-action@v1
 | 
					        uses: gradle/wrapper-validation-action@v2
 | 
				
			||||||
      - name: Setup Java
 | 
					      - name: Setup Java
 | 
				
			||||||
        uses: actions/setup-java@v4
 | 
					        uses: actions/setup-java@v4
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										6
									
								
								.github/workflows/codeql.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.github/workflows/codeql.yml
									
									
									
									
										vendored
									
									
								
							@@ -27,10 +27,10 @@ jobs:
 | 
				
			|||||||
          distribution: temurin
 | 
					          distribution: temurin
 | 
				
			||||||
          java-version: 17
 | 
					          java-version: 17
 | 
				
			||||||
      - name: Initialize CodeQL
 | 
					      - name: Initialize CodeQL
 | 
				
			||||||
        uses: github/codeql-action/init@v2
 | 
					        uses: github/codeql-action/init@v3
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          languages: ${{ matrix.language }}
 | 
					          languages: ${{ matrix.language }}
 | 
				
			||||||
      - name: Autobuild
 | 
					      - name: Autobuild
 | 
				
			||||||
        uses: github/codeql-action/autobuild@v2
 | 
					        uses: github/codeql-action/autobuild@v3
 | 
				
			||||||
      - name: Perform CodeQL Analysis
 | 
					      - name: Perform CodeQL Analysis
 | 
				
			||||||
        uses: github/codeql-action/analyze@v2
 | 
					        uses: github/codeql-action/analyze@v3
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/release-drafter.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/release-drafter.yml
									
									
									
									
										vendored
									
									
								
							@@ -12,6 +12,6 @@ jobs:
 | 
				
			|||||||
    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
 | 
					    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - uses: release-drafter/release-drafter@v5
 | 
					      - uses: release-drafter/release-drafter@v6
 | 
				
			||||||
        env:
 | 
					        env:
 | 
				
			||||||
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 | 
					          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -67,6 +67,7 @@ tasks.named<ShadowJar>("shadowJar") {
 | 
				
			|||||||
        exclude(dependency("org.checkerframework:"))
 | 
					        exclude(dependency("org.checkerframework:"))
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    relocate("net.kyori.option", "com.plotsquared.core.configuration.option")
 | 
				
			||||||
    relocate("net.kyori.adventure", "com.plotsquared.core.configuration.adventure")
 | 
					    relocate("net.kyori.adventure", "com.plotsquared.core.configuration.adventure")
 | 
				
			||||||
    relocate("net.kyori.examination", "com.plotsquared.core.configuration.examination")
 | 
					    relocate("net.kyori.examination", "com.plotsquared.core.configuration.examination")
 | 
				
			||||||
    relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
 | 
					    relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
 | 
				
			||||||
@@ -105,7 +106,7 @@ tasks {
 | 
				
			|||||||
        opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
 | 
					        opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
 | 
				
			||||||
        opt.links("https://jd.advntr.dev/api/4.14.0/")
 | 
					        opt.links("https://jd.advntr.dev/api/4.14.0/")
 | 
				
			||||||
        opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
 | 
					        opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
 | 
				
			||||||
        opt.links("https://checkerframework.org/api/")
 | 
					    //    opt.links("https://checkerframework.org/api/")
 | 
				
			||||||
        opt.isLinkSource = true
 | 
					        opt.isLinkSource = true
 | 
				
			||||||
        opt.bottom(File("$rootDir/javadocfooter.html").readText())
 | 
					        opt.bottom(File("$rootDir/javadocfooter.html").readText())
 | 
				
			||||||
        opt.isUse = true
 | 
					        opt.isUse = true
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -779,6 +779,13 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
 | 
				
			|||||||
                Iterator<Entity> iterator = entities.iterator();
 | 
					                Iterator<Entity> iterator = entities.iterator();
 | 
				
			||||||
                while (iterator.hasNext()) {
 | 
					                while (iterator.hasNext()) {
 | 
				
			||||||
                    Entity entity = iterator.next();
 | 
					                    Entity entity = iterator.next();
 | 
				
			||||||
 | 
					                    if (PaperLib.isPaper() && "CUSTOM".equals(entity.getEntitySpawnReason().name())) {
 | 
				
			||||||
 | 
					                        continue;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                    // Fallback for Spigot not having Entity#getEntitySpawnReason
 | 
				
			||||||
 | 
					                    if (entity.getMetadata("ps_custom_spawned").stream().anyMatch(MetadataValue::asBoolean)) {
 | 
				
			||||||
 | 
					                        continue;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
                    switch (entity.getType().toString()) {
 | 
					                    switch (entity.getType().toString()) {
 | 
				
			||||||
                        case "EGG":
 | 
					                        case "EGG":
 | 
				
			||||||
                        case "FISHING_HOOK":
 | 
					                        case "FISHING_HOOK":
 | 
				
			||||||
@@ -867,8 +874,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
 | 
				
			|||||||
                                    if (livingEntity.isLeashed() && !Settings.Enabled_Components.KILL_OWNED_ROAD_MOBS) {
 | 
					                                    if (livingEntity.isLeashed() && !Settings.Enabled_Components.KILL_OWNED_ROAD_MOBS) {
 | 
				
			||||||
                                        continue;
 | 
					                                        continue;
 | 
				
			||||||
                                    }
 | 
					                                    }
 | 
				
			||||||
                                    List<MetadataValue> keep = entity.getMetadata("keep");
 | 
					                                    if (entity.hasMetadata("keep")) {
 | 
				
			||||||
                                    if (!keep.isEmpty()) {
 | 
					 | 
				
			||||||
                                        continue;
 | 
					                                        continue;
 | 
				
			||||||
                                    }
 | 
					                                    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -261,7 +261,10 @@ public class BlockEventListener implements Listener {
 | 
				
			|||||||
                final BlockFace facing = piston.getFacing();
 | 
					                final BlockFace facing = piston.getFacing();
 | 
				
			||||||
                location = location.add(facing.getModX(), facing.getModY(), facing.getModZ());
 | 
					                location = location.add(facing.getModX(), facing.getModY(), facing.getModZ());
 | 
				
			||||||
                Plot newPlot = area.getOwnedPlotAbs(location);
 | 
					                Plot newPlot = area.getOwnedPlotAbs(location);
 | 
				
			||||||
                if (!plot.equals(newPlot)) {
 | 
					                if (plot.equals(newPlot)) {
 | 
				
			||||||
 | 
					                    return;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                if (!plot.isMerged() || !plot.getConnectedPlots().contains(newPlot)) {
 | 
				
			||||||
                    event.setCancelled(true);
 | 
					                    event.setCancelled(true);
 | 
				
			||||||
                    plot.debug("Prevented piston update because of invalid edge piston detection");
 | 
					                    plot.debug("Prevented piston update because of invalid edge piston detection");
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,6 +19,7 @@
 | 
				
			|||||||
package com.plotsquared.bukkit.listener;
 | 
					package com.plotsquared.bukkit.listener;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import com.google.inject.Inject;
 | 
					import com.google.inject.Inject;
 | 
				
			||||||
 | 
					import com.plotsquared.bukkit.BukkitPlatform;
 | 
				
			||||||
import com.plotsquared.bukkit.player.BukkitPlayer;
 | 
					import com.plotsquared.bukkit.player.BukkitPlayer;
 | 
				
			||||||
import com.plotsquared.bukkit.util.BukkitEntityUtil;
 | 
					import com.plotsquared.bukkit.util.BukkitEntityUtil;
 | 
				
			||||||
import com.plotsquared.bukkit.util.BukkitUtil;
 | 
					import com.plotsquared.bukkit.util.BukkitUtil;
 | 
				
			||||||
@@ -35,11 +36,13 @@ import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
 | 
				
			|||||||
import com.plotsquared.core.plot.flag.implementations.EntityChangeBlockFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.EntityChangeBlockFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.ExplosionFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.ExplosionFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.InvincibleFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.InvincibleFlag;
 | 
				
			||||||
 | 
					import com.plotsquared.core.plot.flag.implementations.ProjectileChangeBlockFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.world.PlotAreaManager;
 | 
					import com.plotsquared.core.plot.world.PlotAreaManager;
 | 
				
			||||||
import com.plotsquared.core.util.EventDispatcher;
 | 
					import com.plotsquared.core.util.EventDispatcher;
 | 
				
			||||||
import com.plotsquared.core.util.PlotFlagUtil;
 | 
					import com.plotsquared.core.util.PlotFlagUtil;
 | 
				
			||||||
import com.sk89q.worldedit.bukkit.BukkitAdapter;
 | 
					import com.sk89q.worldedit.bukkit.BukkitAdapter;
 | 
				
			||||||
import com.sk89q.worldedit.world.block.BlockType;
 | 
					import com.sk89q.worldedit.world.block.BlockType;
 | 
				
			||||||
 | 
					import io.papermc.lib.PaperLib;
 | 
				
			||||||
import org.bukkit.Material;
 | 
					import org.bukkit.Material;
 | 
				
			||||||
import org.bukkit.Particle;
 | 
					import org.bukkit.Particle;
 | 
				
			||||||
import org.bukkit.World;
 | 
					import org.bukkit.World;
 | 
				
			||||||
@@ -53,6 +56,7 @@ import org.bukkit.entity.Player;
 | 
				
			|||||||
import org.bukkit.entity.Projectile;
 | 
					import org.bukkit.entity.Projectile;
 | 
				
			||||||
import org.bukkit.entity.TNTPrimed;
 | 
					import org.bukkit.entity.TNTPrimed;
 | 
				
			||||||
import org.bukkit.entity.Vehicle;
 | 
					import org.bukkit.entity.Vehicle;
 | 
				
			||||||
 | 
					import org.bukkit.event.Cancellable;
 | 
				
			||||||
import org.bukkit.event.EventHandler;
 | 
					import org.bukkit.event.EventHandler;
 | 
				
			||||||
import org.bukkit.event.EventPriority;
 | 
					import org.bukkit.event.EventPriority;
 | 
				
			||||||
import org.bukkit.event.Listener;
 | 
					import org.bukkit.event.Listener;
 | 
				
			||||||
@@ -77,52 +81,43 @@ import java.util.List;
 | 
				
			|||||||
@SuppressWarnings("unused")
 | 
					@SuppressWarnings("unused")
 | 
				
			||||||
public class EntityEventListener implements Listener {
 | 
					public class EntityEventListener implements Listener {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final BukkitPlatform platform;
 | 
				
			||||||
    private final PlotAreaManager plotAreaManager;
 | 
					    private final PlotAreaManager plotAreaManager;
 | 
				
			||||||
    private final EventDispatcher eventDispatcher;
 | 
					    private final EventDispatcher eventDispatcher;
 | 
				
			||||||
    private float lastRadius;
 | 
					    private float lastRadius;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Inject
 | 
					    @Inject
 | 
				
			||||||
    public EntityEventListener(
 | 
					    public EntityEventListener(
 | 
				
			||||||
 | 
					            final @NonNull BukkitPlatform platform,
 | 
				
			||||||
            final @NonNull PlotAreaManager plotAreaManager,
 | 
					            final @NonNull PlotAreaManager plotAreaManager,
 | 
				
			||||||
            final @NonNull EventDispatcher eventDispatcher
 | 
					            final @NonNull EventDispatcher eventDispatcher
 | 
				
			||||||
    ) {
 | 
					    ) {
 | 
				
			||||||
 | 
					        this.platform = platform;
 | 
				
			||||||
        this.plotAreaManager = plotAreaManager;
 | 
					        this.plotAreaManager = plotAreaManager;
 | 
				
			||||||
        this.eventDispatcher = eventDispatcher;
 | 
					        this.eventDispatcher = eventDispatcher;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @EventHandler(priority = EventPriority.HIGHEST)
 | 
					    @EventHandler(priority = EventPriority.HIGHEST)
 | 
				
			||||||
    public void onEntityCombustByEntity(EntityCombustByEntityEvent event) {
 | 
					    public void onEntityCombustByEntity(EntityCombustByEntityEvent event) {
 | 
				
			||||||
        EntityDamageByEntityEvent eventChange =
 | 
					        onEntityDamageByEntityCommon(event.getCombuster(), event.getEntity(), EntityDamageEvent.DamageCause.FIRE_TICK, event);
 | 
				
			||||||
                new EntityDamageByEntityEvent(
 | 
					 | 
				
			||||||
                        event.getCombuster(),
 | 
					 | 
				
			||||||
                        event.getEntity(),
 | 
					 | 
				
			||||||
                        EntityDamageEvent.DamageCause.FIRE_TICK,
 | 
					 | 
				
			||||||
                        event.getDuration()
 | 
					 | 
				
			||||||
                );
 | 
					 | 
				
			||||||
        onEntityDamageByEntityEvent(eventChange);
 | 
					 | 
				
			||||||
        if (eventChange.isCancelled()) {
 | 
					 | 
				
			||||||
            event.setCancelled(true);
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @EventHandler(priority = EventPriority.HIGHEST)
 | 
					    @EventHandler(priority = EventPriority.HIGHEST)
 | 
				
			||||||
    public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) {
 | 
					    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());
 | 
					        Location location = BukkitUtil.adapt(damager.getLocation());
 | 
				
			||||||
        if (!this.plotAreaManager.hasPlotArea(location.getWorldName())) {
 | 
					        if (!this.plotAreaManager.hasPlotArea(location.getWorldName())) {
 | 
				
			||||||
            return;
 | 
					            return;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        Entity victim = event.getEntity();
 | 
					        if (!BukkitEntityUtil.entityDamage(damager, victim, cause)) {
 | 
				
			||||||
/*
 | 
					 | 
				
			||||||
        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 (event.isCancelled()) {
 | 
					            if (event.isCancelled()) {
 | 
				
			||||||
                if (victim instanceof Ageable ageable) {
 | 
					                if (victim instanceof Ageable ageable) {
 | 
				
			||||||
                    if (ageable.getAge() == -24000) {
 | 
					                    if (ageable.getAge() == -24000) {
 | 
				
			||||||
@@ -169,7 +164,18 @@ public class EntityEventListener implements Listener {
 | 
				
			|||||||
                    return;
 | 
					                    return;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
 | 
					            case "CUSTOM" -> {
 | 
				
			||||||
 | 
					                if (!area.isSpawnCustom()) {
 | 
				
			||||||
 | 
					                    event.setCancelled(true);
 | 
				
			||||||
 | 
					                    return;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                // No need to clutter metadata if running paper
 | 
				
			||||||
 | 
					                if (!PaperLib.isPaper()) {
 | 
				
			||||||
 | 
					                    entity.setMetadata("ps_custom_spawned", new FixedMetadataValue(this.platform, true));
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                return; // Don't cancel if mob spawning is disabled
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER" -> {
 | 
				
			||||||
                if (!area.isSpawnCustom()) {
 | 
					                if (!area.isSpawnCustom()) {
 | 
				
			||||||
                    event.setCancelled(true);
 | 
					                    event.setCancelled(true);
 | 
				
			||||||
                    return;
 | 
					                    return;
 | 
				
			||||||
@@ -358,13 +364,13 @@ public class EntityEventListener implements Listener {
 | 
				
			|||||||
            if (shooter instanceof Player) {
 | 
					            if (shooter instanceof Player) {
 | 
				
			||||||
                PlotPlayer<?> pp = BukkitUtil.adapt((Player) shooter);
 | 
					                PlotPlayer<?> pp = BukkitUtil.adapt((Player) shooter);
 | 
				
			||||||
                if (plot == null) {
 | 
					                if (plot == null) {
 | 
				
			||||||
                    if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
 | 
					                    if (area.isRoadFlags() && !area.getRoadFlag(ProjectileChangeBlockFlag.class) && !pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_UNOWNED)) {
 | 
				
			||||||
                        entity.remove();
 | 
					                        entity.remove();
 | 
				
			||||||
                        event.setCancelled(true);
 | 
					                        event.setCancelled(true);
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                    return;
 | 
					                    return;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
 | 
					                if (plot.isAdded(pp.getUUID()) || plot.getFlag(ProjectileChangeBlockFlag.class) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
 | 
				
			||||||
                    return;
 | 
					                    return;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                entity.remove();
 | 
					                entity.remove();
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -120,9 +120,14 @@ public class EntitySpawnListener implements Listener {
 | 
				
			|||||||
        Entity entity = event.getEntity();
 | 
					        Entity entity = event.getEntity();
 | 
				
			||||||
        Location location = BukkitUtil.adapt(entity.getLocation());
 | 
					        Location location = BukkitUtil.adapt(entity.getLocation());
 | 
				
			||||||
        PlotArea area = location.getPlotArea();
 | 
					        PlotArea area = location.getPlotArea();
 | 
				
			||||||
        if (!location.isPlotArea()) {
 | 
					        if (!location.isPlotArea() || area == null) {
 | 
				
			||||||
            return;
 | 
					            return;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					        if (PaperLib.isPaper()) {
 | 
				
			||||||
 | 
					            if (area.isSpawnCustom() && "CUSTOM".equals(entity.getEntitySpawnReason().name())) {
 | 
				
			||||||
 | 
					                return;
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
        Plot plot = location.getOwnedPlotAbs();
 | 
					        Plot plot = location.getOwnedPlotAbs();
 | 
				
			||||||
        EntityType type = entity.getType();
 | 
					        EntityType type = entity.getType();
 | 
				
			||||||
        if (plot == null) {
 | 
					        if (plot == null) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -50,6 +50,7 @@ import com.plotsquared.core.plot.flag.implementations.DenyPortalsFlag;
 | 
				
			|||||||
import com.plotsquared.core.plot.flag.implementations.DenyTeleportFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.DenyTeleportFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.DropProtectionFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.DropProtectionFlag;
 | 
				
			||||||
 | 
					import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.HangingBreakFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.HangingBreakFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.HangingPlaceFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.HangingPlaceFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.HostileInteractFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.HostileInteractFlag;
 | 
				
			||||||
@@ -87,6 +88,7 @@ import org.bukkit.Material;
 | 
				
			|||||||
import org.bukkit.block.Block;
 | 
					import org.bukkit.block.Block;
 | 
				
			||||||
import org.bukkit.block.BlockFace;
 | 
					import org.bukkit.block.BlockFace;
 | 
				
			||||||
import org.bukkit.block.BlockState;
 | 
					import org.bukkit.block.BlockState;
 | 
				
			||||||
 | 
					import org.bukkit.block.Sign;
 | 
				
			||||||
import org.bukkit.block.data.Waterlogged;
 | 
					import org.bukkit.block.data.Waterlogged;
 | 
				
			||||||
import org.bukkit.command.PluginCommand;
 | 
					import org.bukkit.command.PluginCommand;
 | 
				
			||||||
import org.bukkit.entity.ArmorStand;
 | 
					import org.bukkit.entity.ArmorStand;
 | 
				
			||||||
@@ -175,6 +177,33 @@ public class PlayerEventListener implements Listener {
 | 
				
			|||||||
            Material.WRITABLE_BOOK,
 | 
					            Material.WRITABLE_BOOK,
 | 
				
			||||||
            Material.WRITTEN_BOOK
 | 
					            Material.WRITTEN_BOOK
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
 | 
					    private static final Set<String> DYES;
 | 
				
			||||||
 | 
					    static {
 | 
				
			||||||
 | 
					        Set<String> mutableDyes = new HashSet<>(Set.of(
 | 
				
			||||||
 | 
					                "WHITE_DYE",
 | 
				
			||||||
 | 
					                "LIGHT_GRAY_DYE",
 | 
				
			||||||
 | 
					                "GRAY_DYE",
 | 
				
			||||||
 | 
					                "BLACK_DYE",
 | 
				
			||||||
 | 
					                "BROWN_DYE",
 | 
				
			||||||
 | 
					                "RED_DYE",
 | 
				
			||||||
 | 
					                "ORANGE_DYE",
 | 
				
			||||||
 | 
					                "YELLOW_DYE",
 | 
				
			||||||
 | 
					                "LIME_DYE",
 | 
				
			||||||
 | 
					                "GREEN_DYE",
 | 
				
			||||||
 | 
					                "CYAN_DYE",
 | 
				
			||||||
 | 
					                "LIGHT_BLUE_DYE",
 | 
				
			||||||
 | 
					                "BLUE_DYE",
 | 
				
			||||||
 | 
					                "PURPLE_DYE",
 | 
				
			||||||
 | 
					                "MAGENTA_DYE",
 | 
				
			||||||
 | 
					                "PINK_DYE",
 | 
				
			||||||
 | 
					                "GLOW_INK_SAC"
 | 
				
			||||||
 | 
					        ));
 | 
				
			||||||
 | 
					        int[] version = PlotSquared.platform().serverVersion();
 | 
				
			||||||
 | 
					        if (version[1] >= 20 && version[2] >= 1) {
 | 
				
			||||||
 | 
					            mutableDyes.add("HONEYCOMB");
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        DYES = Set.copyOf(mutableDyes);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    private final EventDispatcher eventDispatcher;
 | 
					    private final EventDispatcher eventDispatcher;
 | 
				
			||||||
    private final WorldEdit worldEdit;
 | 
					    private final WorldEdit worldEdit;
 | 
				
			||||||
    private final PlotAreaManager plotAreaManager;
 | 
					    private final PlotAreaManager plotAreaManager;
 | 
				
			||||||
@@ -207,6 +236,40 @@ public class PlayerEventListener implements Listener {
 | 
				
			|||||||
        this.plotListener = plotListener;
 | 
					        this.plotListener = plotListener;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 | 
				
			||||||
 | 
					    public void onPlayerDyeSign(PlayerInteractEvent event) {
 | 
				
			||||||
 | 
					        ItemStack itemStack = event.getItem();
 | 
				
			||||||
 | 
					        if (itemStack == null) {
 | 
				
			||||||
 | 
					            return;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        Block block = event.getClickedBlock();
 | 
				
			||||||
 | 
					        if (block != null && block.getState() instanceof Sign) {
 | 
				
			||||||
 | 
					            if (DYES.contains(itemStack.getType().toString())) {
 | 
				
			||||||
 | 
					                Location location = BukkitUtil.adapt(block.getLocation());
 | 
				
			||||||
 | 
					                PlotArea area = location.getPlotArea();
 | 
				
			||||||
 | 
					                if (area == null) {
 | 
				
			||||||
 | 
					                    return;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                Plot plot = location.getOwnedPlot();
 | 
				
			||||||
 | 
					                if (plot == null) {
 | 
				
			||||||
 | 
					                    if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)
 | 
				
			||||||
 | 
					                            && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString())) {
 | 
				
			||||||
 | 
					                        event.setCancelled(true);
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
 | 
					                    return;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                if (plot.isAdded(event.getPlayer().getUniqueId())) {
 | 
				
			||||||
 | 
					                    return; // allow for added players
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                if (!plot.getFlag(EditSignFlag.class)
 | 
				
			||||||
 | 
					                        && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString())) {
 | 
				
			||||||
 | 
					                    plot.debug(event.getPlayer().getName() + " could not color the sign because of edit-sign = false");
 | 
				
			||||||
 | 
					                    event.setCancelled(true);
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @EventHandler(ignoreCancelled = true)
 | 
					    @EventHandler(ignoreCancelled = true)
 | 
				
			||||||
    public void onEffect(@NonNull EntityPotionEffectEvent event) {
 | 
					    public void onEffect(@NonNull EntityPotionEffectEvent event) {
 | 
				
			||||||
        if (Settings.Enabled_Components.DISABLE_BEACON_EFFECT_OVERFLOW ||
 | 
					        if (Settings.Enabled_Components.DISABLE_BEACON_EFFECT_OVERFLOW ||
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,6 +20,7 @@ package com.plotsquared.bukkit.listener;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import com.plotsquared.bukkit.util.BukkitUtil;
 | 
					import com.plotsquared.bukkit.util.BukkitUtil;
 | 
				
			||||||
import com.plotsquared.core.location.Location;
 | 
					import com.plotsquared.core.location.Location;
 | 
				
			||||||
 | 
					import com.plotsquared.core.permissions.Permission;
 | 
				
			||||||
import com.plotsquared.core.plot.Plot;
 | 
					import com.plotsquared.core.plot.Plot;
 | 
				
			||||||
import com.plotsquared.core.plot.PlotArea;
 | 
					import com.plotsquared.core.plot.PlotArea;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
 | 
				
			||||||
@@ -31,7 +32,7 @@ import org.bukkit.event.player.PlayerSignOpenEvent;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * For events since 1.20.1
 | 
					 * For events since 1.20.1
 | 
				
			||||||
 * @since TODO
 | 
					 * @since 7.2.1
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
public class PlayerEventListener1201 implements Listener {
 | 
					public class PlayerEventListener1201 implements Listener {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -46,7 +47,8 @@ public class PlayerEventListener1201 implements Listener {
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
        Plot plot = location.getOwnedPlot();
 | 
					        Plot plot = location.getOwnedPlot();
 | 
				
			||||||
        if (plot == null) {
 | 
					        if (plot == null) {
 | 
				
			||||||
            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)) {
 | 
					            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)
 | 
				
			||||||
 | 
					                    && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString())) {
 | 
				
			||||||
                event.setCancelled(true);
 | 
					                event.setCancelled(true);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            return;
 | 
					            return;
 | 
				
			||||||
@@ -54,7 +56,8 @@ public class PlayerEventListener1201 implements Listener {
 | 
				
			|||||||
        if (plot.isAdded(event.getPlayer().getUniqueId())) {
 | 
					        if (plot.isAdded(event.getPlayer().getUniqueId())) {
 | 
				
			||||||
            return; // allow for added players
 | 
					            return; // allow for added players
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        if (!plot.getFlag(EditSignFlag.class)) {
 | 
					        if (!plot.getFlag(EditSignFlag.class)
 | 
				
			||||||
 | 
					                && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString())) {
 | 
				
			||||||
            plot.debug(event.getPlayer().getName() + " could not edit the sign because of edit-sign = false");
 | 
					            plot.debug(event.getPlayer().getName() + " could not edit the sign because of edit-sign = false");
 | 
				
			||||||
            event.setCancelled(true);
 | 
					            event.setCancelled(true);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -40,6 +40,7 @@ import io.papermc.lib.PaperLib;
 | 
				
			|||||||
import net.kyori.adventure.audience.Audience;
 | 
					import net.kyori.adventure.audience.Audience;
 | 
				
			||||||
import org.bukkit.GameMode;
 | 
					import org.bukkit.GameMode;
 | 
				
			||||||
import org.bukkit.Sound;
 | 
					import org.bukkit.Sound;
 | 
				
			||||||
 | 
					import org.bukkit.SoundCategory;
 | 
				
			||||||
import org.bukkit.WeatherType;
 | 
					import org.bukkit.WeatherType;
 | 
				
			||||||
import org.bukkit.entity.Player;
 | 
					import org.bukkit.entity.Player;
 | 
				
			||||||
import org.bukkit.event.Event;
 | 
					import org.bukkit.event.Event;
 | 
				
			||||||
@@ -51,7 +52,6 @@ import org.bukkit.potion.PotionEffectType;
 | 
				
			|||||||
import org.checkerframework.checker.index.qual.NonNegative;
 | 
					import org.checkerframework.checker.index.qual.NonNegative;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import java.util.Arrays;
 | 
					 | 
				
			||||||
import java.util.Set;
 | 
					import java.util.Set;
 | 
				
			||||||
import java.util.UUID;
 | 
					import java.util.UUID;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -309,19 +309,22 @@ public class BukkitPlayer extends PlotPlayer<Player> {
 | 
				
			|||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public void playMusic(final @NonNull Location location, final @NonNull ItemType id) {
 | 
					    public void playMusic(final @NonNull Location location, final @NonNull ItemType id) {
 | 
				
			||||||
        if (id == ItemTypes.AIR) {
 | 
					        if (id == ItemTypes.AIR) {
 | 
				
			||||||
            // Let's just stop all the discs because why not?
 | 
					            if (PlotSquared.platform().serverVersion()[1] >= 19) {
 | 
				
			||||||
            for (final Sound sound : Arrays.stream(Sound.values())
 | 
					                player.stopSound(SoundCategory.MUSIC);
 | 
				
			||||||
                    .filter(sound -> sound.name().contains("DISC")).toList()) {
 | 
					                return;
 | 
				
			||||||
                player.stopSound(sound);
 | 
					 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, Material.AIR);
 | 
					            // 1.18 and downwards require a specific Sound to stop (even tho the packet does not??)
 | 
				
			||||||
        } else {
 | 
					            for (final Sound sound : Sound.values()) {
 | 
				
			||||||
            // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, id.to(Material.class));
 | 
					                if (sound.name().startsWith("MUSIC_DISC")) {
 | 
				
			||||||
            this.player.playSound(BukkitUtil.adapt(location),
 | 
					                    this.player.stopSound(sound, SoundCategory.MUSIC);
 | 
				
			||||||
                    Sound.valueOf(BukkitAdapter.adapt(id).name()), Float.MAX_VALUE, 1f
 | 
					                }
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					            return;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        this.player.playSound(BukkitUtil.adapt(location), Sound.valueOf(BukkitAdapter.adapt(id).name()),
 | 
				
			||||||
 | 
					                SoundCategory.MUSIC, 1f, 1f
 | 
				
			||||||
        );
 | 
					        );
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @SuppressWarnings("deprecation") // Needed for Spigot compatibility
 | 
					    @SuppressWarnings("deprecation") // Needed for Spigot compatibility
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -47,7 +47,21 @@ public class TranslationUpdateManager {
 | 
				
			|||||||
        String usedGrants = "usedGrants";
 | 
					        String usedGrants = "usedGrants";
 | 
				
			||||||
        String usedGrantsReplacement = "used_grants";
 | 
					        String usedGrantsReplacement = "used_grants";
 | 
				
			||||||
        String remainingGrants = "remainingGrants";
 | 
					        String remainingGrants = "remainingGrants";
 | 
				
			||||||
        String rremainingGrantsReplacement = "remaining_grants";
 | 
					        String remainingGrantsReplacement = "remaining_grants";
 | 
				
			||||||
 | 
					        String minimumRadius = "minimumRadius";
 | 
				
			||||||
 | 
					        String minimumRadiusReplacement = "minimum_radius";
 | 
				
			||||||
 | 
					        String maximumMoves = "maximumMoves";
 | 
				
			||||||
 | 
					        String maximumMovesReplacement = "maximum_moves";
 | 
				
			||||||
 | 
					        String userMove = "userMove";
 | 
				
			||||||
 | 
					        String userMoveReplacement = "user_move";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // tag opening / closing characters are important, as the locale keys exist as well, which should not be replaced
 | 
				
			||||||
 | 
					        String listInfoUnknown = "<info.unknown>";
 | 
				
			||||||
 | 
					        String listInfoUnknownReplacement = "<unknown>";
 | 
				
			||||||
 | 
					        String listInfoServer = "<info.server>";
 | 
				
			||||||
 | 
					        String listInfoServerReplacement = "<server>";
 | 
				
			||||||
 | 
					        String listInfoEveryone = "<info.everyone>";
 | 
				
			||||||
 | 
					        String listInfoEveryoneReplacement = "<everyone>";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        try (Stream<Path> paths = Files.walk(Paths.get(PlotSquared.platform().getDirectory().toPath().resolve("lang").toUri()))) {
 | 
					        try (Stream<Path> paths = Files.walk(Paths.get(PlotSquared.platform().getDirectory().toPath().resolve("lang").toUri()))) {
 | 
				
			||||||
            paths
 | 
					            paths
 | 
				
			||||||
@@ -58,7 +72,13 @@ public class TranslationUpdateManager {
 | 
				
			|||||||
                        replaceInFile(p, minHeight, minheightReplacement);
 | 
					                        replaceInFile(p, minHeight, minheightReplacement);
 | 
				
			||||||
                        replaceInFile(p, maxHeight, maxheightReplacement);
 | 
					                        replaceInFile(p, maxHeight, maxheightReplacement);
 | 
				
			||||||
                        replaceInFile(p, usedGrants, usedGrantsReplacement);
 | 
					                        replaceInFile(p, usedGrants, usedGrantsReplacement);
 | 
				
			||||||
                        replaceInFile(p, remainingGrants, rremainingGrantsReplacement);
 | 
					                        replaceInFile(p, remainingGrants, remainingGrantsReplacement);
 | 
				
			||||||
 | 
					                        replaceInFile(p, minimumRadius, minimumRadiusReplacement);
 | 
				
			||||||
 | 
					                        replaceInFile(p, maximumMoves, maximumMovesReplacement);
 | 
				
			||||||
 | 
					                        replaceInFile(p, userMove, userMoveReplacement);
 | 
				
			||||||
 | 
					                        replaceInFile(p, listInfoUnknown, listInfoUnknownReplacement);
 | 
				
			||||||
 | 
					                        replaceInFile(p, listInfoServer, listInfoServerReplacement);
 | 
				
			||||||
 | 
					                        replaceInFile(p, listInfoEveryone, listInfoEveryoneReplacement);
 | 
				
			||||||
                    });
 | 
					                    });
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -37,7 +37,9 @@ import com.sk89q.worldedit.regions.CuboidRegion;
 | 
				
			|||||||
import com.sk89q.worldedit.world.biome.BiomeType;
 | 
					import com.sk89q.worldedit.world.biome.BiomeType;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
import org.checkerframework.checker.nullness.qual.Nullable;
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
 | 
					import org.jetbrains.annotations.NotNull;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import java.util.Objects;
 | 
				
			||||||
import java.util.Set;
 | 
					import java.util.Set;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public class FaweRegionManager extends BukkitRegionManager {
 | 
					public class FaweRegionManager extends BukkitRegionManager {
 | 
				
			||||||
@@ -59,7 +61,10 @@ public class FaweRegionManager extends BukkitRegionManager {
 | 
				
			|||||||
            @Nullable PlotPlayer<?> actor,
 | 
					            @Nullable PlotPlayer<?> actor,
 | 
				
			||||||
            @Nullable QueueCoordinator queue
 | 
					            @Nullable QueueCoordinator queue
 | 
				
			||||||
    ) {
 | 
					    ) {
 | 
				
			||||||
        return delegate.setCuboids(area, regions, blocks, minY, maxY, queue.getCompleteTask());
 | 
					        return delegate.setCuboids(
 | 
				
			||||||
 | 
					                area, regions, blocks, minY, maxY,
 | 
				
			||||||
 | 
					                Objects.requireNonNullElseGet(queue, area::getQueue).getCompleteTask()
 | 
				
			||||||
 | 
					        );
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
@@ -111,7 +116,7 @@ public class FaweRegionManager extends BukkitRegionManager {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public boolean regenerateRegion(final Location pos1, final Location pos2, boolean ignore, final Runnable whenDone) {
 | 
					    public boolean regenerateRegion(final @NotNull Location pos1, final @NotNull Location pos2, boolean ignore, final Runnable whenDone) {
 | 
				
			||||||
        return delegate.regenerateRegion(pos1, pos2, ignore, whenDone);
 | 
					        return delegate.regenerateRegion(pos1, pos2, ignore, whenDone);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -71,7 +71,7 @@ tasks {
 | 
				
			|||||||
        opt.links("https://jd.advntr.dev/api/4.14.0/")
 | 
					        opt.links("https://jd.advntr.dev/api/4.14.0/")
 | 
				
			||||||
        opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/")
 | 
					        opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/")
 | 
				
			||||||
        opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
 | 
					        opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
 | 
				
			||||||
        opt.links("https://checkerframework.org/api/")
 | 
					      //  opt.links("https://checkerframework.org/api/")
 | 
				
			||||||
        opt.isLinkSource = true
 | 
					        opt.isLinkSource = true
 | 
				
			||||||
        opt.bottom(File("$rootDir/javadocfooter.html").readText())
 | 
					        opt.bottom(File("$rootDir/javadocfooter.html").readText())
 | 
				
			||||||
        opt.isUse = true
 | 
					        opt.isUse = true
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,8 +21,9 @@ package com.plotsquared.core.command;
 | 
				
			|||||||
import com.google.inject.Inject;
 | 
					import com.google.inject.Inject;
 | 
				
			||||||
import com.plotsquared.core.PlotSquared;
 | 
					import com.plotsquared.core.PlotSquared;
 | 
				
			||||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
 | 
					import com.plotsquared.core.configuration.caption.TranslatableCaption;
 | 
				
			||||||
import com.plotsquared.core.events.PlotFlagRemoveEvent;
 | 
					import com.plotsquared.core.events.PlayerBuyPlotEvent;
 | 
				
			||||||
import com.plotsquared.core.events.Result;
 | 
					import com.plotsquared.core.events.Result;
 | 
				
			||||||
 | 
					import com.plotsquared.core.player.OfflinePlotPlayer;
 | 
				
			||||||
import com.plotsquared.core.player.PlotPlayer;
 | 
					import com.plotsquared.core.player.PlotPlayer;
 | 
				
			||||||
import com.plotsquared.core.plot.Plot;
 | 
					import com.plotsquared.core.plot.Plot;
 | 
				
			||||||
import com.plotsquared.core.plot.PlotArea;
 | 
					import com.plotsquared.core.plot.PlotArea;
 | 
				
			||||||
@@ -88,22 +89,30 @@ public class Buy extends Command {
 | 
				
			|||||||
                TranslatableCaption.of("permission.cant_claim_more_plots"),
 | 
					                TranslatableCaption.of("permission.cant_claim_more_plots"),
 | 
				
			||||||
                TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
 | 
					                TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
 | 
				
			||||||
        );
 | 
					        );
 | 
				
			||||||
        double price = plot.getFlag(PriceFlag.class);
 | 
					        double priceFlag = plot.getFlag(PriceFlag.class);
 | 
				
			||||||
        if (price <= 0) {
 | 
					        if (priceFlag <= 0) {
 | 
				
			||||||
            throw new CommandException(TranslatableCaption.of("economy.not_for_sale"));
 | 
					            throw new CommandException(TranslatableCaption.of("economy.not_for_sale"));
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        checkTrue(
 | 
					        checkTrue(
 | 
				
			||||||
                this.econHandler.isSupported(),
 | 
					                this.econHandler.isSupported(),
 | 
				
			||||||
                TranslatableCaption.of("economy.vault_or_consumer_null")
 | 
					                TranslatableCaption.of("economy.vault_or_consumer_null")
 | 
				
			||||||
        );
 | 
					        );
 | 
				
			||||||
        checkTrue(
 | 
					
 | 
				
			||||||
                this.econHandler.getMoney(player) >= price,
 | 
					        PlayerBuyPlotEvent event = this.eventDispatcher.callPlayerBuyPlot(player, plot, priceFlag);
 | 
				
			||||||
 | 
					        if (event.getEventResult() == Result.DENY) {
 | 
				
			||||||
 | 
					            throw new CommandException(TranslatableCaption.of("economy.cannot_buy_blocked"));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        double price = event.getEventResult() == Result.FORCE ? 0 : event.price();
 | 
				
			||||||
 | 
					        if (this.econHandler.getMoney(player) < price) {
 | 
				
			||||||
 | 
					            throw new CommandException(
 | 
				
			||||||
                    TranslatableCaption.of("economy.cannot_afford_plot"),
 | 
					                    TranslatableCaption.of("economy.cannot_afford_plot"),
 | 
				
			||||||
                    TagResolver.builder()
 | 
					                    TagResolver.builder()
 | 
				
			||||||
                            .tag("money", Tag.inserting(Component.text(this.econHandler.format(price))))
 | 
					                            .tag("money", Tag.inserting(Component.text(this.econHandler.format(price))))
 | 
				
			||||||
                            .tag("balance", Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player)))))
 | 
					                            .tag("balance", Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player)))))
 | 
				
			||||||
                            .build()
 | 
					                            .build()
 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
        this.econHandler.withdrawMoney(player, price);
 | 
					        this.econHandler.withdrawMoney(player, price);
 | 
				
			||||||
        // Failure
 | 
					        // Failure
 | 
				
			||||||
        // Success
 | 
					        // Success
 | 
				
			||||||
@@ -113,7 +122,8 @@ public class Buy extends Command {
 | 
				
			|||||||
                    TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
 | 
					                    TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            this.econHandler.depositMoney(PlotSquared.platform().playerManager().getOfflinePlayer(plot.getOwnerAbs()), price);
 | 
					            OfflinePlotPlayer previousOwner = PlotSquared.platform().playerManager().getOfflinePlayer(plot.getOwnerAbs());
 | 
				
			||||||
 | 
					            this.econHandler.depositMoney(previousOwner, price);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            PlotPlayer<?> owner = PlotSquared.platform().playerManager().getPlayerIfExists(plot.getOwnerAbs());
 | 
					            PlotPlayer<?> owner = PlotSquared.platform().playerManager().getPlayerIfExists(plot.getOwnerAbs());
 | 
				
			||||||
            if (owner != null) {
 | 
					            if (owner != null) {
 | 
				
			||||||
@@ -127,9 +137,8 @@ public class Buy extends Command {
 | 
				
			|||||||
                );
 | 
					                );
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class);
 | 
					            PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class);
 | 
				
			||||||
            PlotFlagRemoveEvent event = this.eventDispatcher.callFlagRemove(plotFlag, plot);
 | 
					            if (this.eventDispatcher.callFlagRemove(plotFlag, plot).getEventResult() != Result.DENY) {
 | 
				
			||||||
            if (event.getEventResult() != Result.DENY) {
 | 
					                plot.removeFlag(plotFlag);
 | 
				
			||||||
                plot.removeFlag(event.getFlag());
 | 
					 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            plot.setOwner(player.getUUID());
 | 
					            plot.setOwner(player.getUUID());
 | 
				
			||||||
            plot.getPlotModificationManager().setSign(player.getName());
 | 
					            plot.getPlotModificationManager().setSign(player.getName());
 | 
				
			||||||
@@ -137,6 +146,7 @@ public class Buy extends Command {
 | 
				
			|||||||
                    TranslatableCaption.of("working.claimed"),
 | 
					                    TranslatableCaption.of("working.claimed"),
 | 
				
			||||||
                    TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
 | 
					                    TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
 | 
					            this.eventDispatcher.callPostPlayerBuyPlot(player, previousOwner, plot, price);
 | 
				
			||||||
            whenDone.run(Buy.this, CommandResult.SUCCESS);
 | 
					            whenDone.run(Buy.this, CommandResult.SUCCESS);
 | 
				
			||||||
        }, () -> {
 | 
					        }, () -> {
 | 
				
			||||||
            this.econHandler.depositMoney(player, price);
 | 
					            this.econHandler.depositMoney(player, price);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -135,6 +135,7 @@ public class Clear extends Command {
 | 
				
			|||||||
                                    .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
 | 
					                                    .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
 | 
				
			||||||
                                    .build()
 | 
					                                    .build()
 | 
				
			||||||
                    );
 | 
					                    );
 | 
				
			||||||
 | 
					                    this.eventDispatcher.callPostPlotClear(player, plot);
 | 
				
			||||||
                }));
 | 
					                }));
 | 
				
			||||||
                if (!result) {
 | 
					                if (!result) {
 | 
				
			||||||
                    player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
 | 
					                    player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -256,11 +256,11 @@ public class Condense extends SubCommand {
 | 
				
			|||||||
                player.sendMessage(TranslatableCaption.of("condense.default_eval"));
 | 
					                player.sendMessage(TranslatableCaption.of("condense.default_eval"));
 | 
				
			||||||
                player.sendMessage(
 | 
					                player.sendMessage(
 | 
				
			||||||
                        TranslatableCaption.of("condense.minimum_radius"),
 | 
					                        TranslatableCaption.of("condense.minimum_radius"),
 | 
				
			||||||
                        TagResolver.resolver("minimumRadius", Tag.inserting(Component.text(minimumRadius)))
 | 
					                        TagResolver.resolver("minimum_radius", Tag.inserting(Component.text(minimumRadius)))
 | 
				
			||||||
                );
 | 
					                );
 | 
				
			||||||
                player.sendMessage(
 | 
					                player.sendMessage(
 | 
				
			||||||
                        TranslatableCaption.of("condense.maximum_moved"),
 | 
					                        TranslatableCaption.of("condense.maximum_moved"),
 | 
				
			||||||
                        TagResolver.resolver("maxMove", Tag.inserting(Component.text(maxMove)))
 | 
					                        TagResolver.resolver("maximum_moves", Tag.inserting(Component.text(maxMove)))
 | 
				
			||||||
                );
 | 
					                );
 | 
				
			||||||
                player.sendMessage(TranslatableCaption.of("condense.input_eval"));
 | 
					                player.sendMessage(TranslatableCaption.of("condense.input_eval"));
 | 
				
			||||||
                player.sendMessage(
 | 
					                player.sendMessage(
 | 
				
			||||||
@@ -269,7 +269,7 @@ public class Condense extends SubCommand {
 | 
				
			|||||||
                );
 | 
					                );
 | 
				
			||||||
                player.sendMessage(
 | 
					                player.sendMessage(
 | 
				
			||||||
                        TranslatableCaption.of("condense.estimated_moves"),
 | 
					                        TranslatableCaption.of("condense.estimated_moves"),
 | 
				
			||||||
                        TagResolver.resolver("userMove", Tag.inserting(Component.text(userMove)))
 | 
					                        TagResolver.resolver("user_move", Tag.inserting(Component.text(userMove)))
 | 
				
			||||||
                );
 | 
					                );
 | 
				
			||||||
                player.sendMessage(TranslatableCaption.of("condense.eta"));
 | 
					                player.sendMessage(TranslatableCaption.of("condense.eta"));
 | 
				
			||||||
                player.sendMessage(TranslatableCaption.of("condense.radius_measured"));
 | 
					                player.sendMessage(TranslatableCaption.of("condense.radius_measured"));
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -94,7 +94,7 @@ public class Done extends SubCommand {
 | 
				
			|||||||
                TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
 | 
					                TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
 | 
				
			||||||
        );
 | 
					        );
 | 
				
			||||||
        final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
 | 
					        final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
 | 
				
			||||||
        if (PlotSquared.platform().expireManager() == null || doneRequirements == null) {
 | 
					        if (PlotSquared.platform().expireManager() == null || doneRequirements == null || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DONE)) {
 | 
				
			||||||
            finish(plot, player, true);
 | 
					            finish(plot, player, true);
 | 
				
			||||||
            plot.removeRunning();
 | 
					            plot.removeRunning();
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -465,7 +465,7 @@ public class ListCmd extends SubCommand {
 | 
				
			|||||||
                TextComponent.Builder builder = Component.text();
 | 
					                TextComponent.Builder builder = Component.text();
 | 
				
			||||||
                if (plot.getFlag(ServerPlotFlag.class)) {
 | 
					                if (plot.getFlag(ServerPlotFlag.class)) {
 | 
				
			||||||
                    TagResolver serverResolver = TagResolver.resolver(
 | 
					                    TagResolver serverResolver = TagResolver.resolver(
 | 
				
			||||||
                            "info.server",
 | 
					                            "server",
 | 
				
			||||||
                            Tag.inserting(TranslatableCaption.of("info.server").toComponent(player))
 | 
					                            Tag.inserting(TranslatableCaption.of("info.server").toComponent(player))
 | 
				
			||||||
                    );
 | 
					                    );
 | 
				
			||||||
                    builder.append(MINI_MESSAGE.deserialize(server, serverResolver));
 | 
					                    builder.append(MINI_MESSAGE.deserialize(server, serverResolver));
 | 
				
			||||||
@@ -483,13 +483,13 @@ public class ListCmd extends SubCommand {
 | 
				
			|||||||
                                builder.append(MINI_MESSAGE.deserialize(online, resolver));
 | 
					                                builder.append(MINI_MESSAGE.deserialize(online, resolver));
 | 
				
			||||||
                            } else if (uuidMapping.username().equalsIgnoreCase("unknown")) {
 | 
					                            } else if (uuidMapping.username().equalsIgnoreCase("unknown")) {
 | 
				
			||||||
                                TagResolver unknownResolver = TagResolver.resolver(
 | 
					                                TagResolver unknownResolver = TagResolver.resolver(
 | 
				
			||||||
                                        "info.unknown",
 | 
					                                        "unknown",
 | 
				
			||||||
                                        Tag.inserting(TranslatableCaption.of("info.unknown").toComponent(player))
 | 
					                                        Tag.inserting(TranslatableCaption.of("info.unknown").toComponent(player))
 | 
				
			||||||
                                );
 | 
					                                );
 | 
				
			||||||
                                builder.append(MINI_MESSAGE.deserialize(unknown, unknownResolver));
 | 
					                                builder.append(MINI_MESSAGE.deserialize(unknown, unknownResolver));
 | 
				
			||||||
                            } else if (uuidMapping.uuid().equals(DBFunc.EVERYONE)) {
 | 
					                            } else if (uuidMapping.uuid().equals(DBFunc.EVERYONE)) {
 | 
				
			||||||
                                TagResolver everyoneResolver = TagResolver.resolver(
 | 
					                                TagResolver everyoneResolver = TagResolver.resolver(
 | 
				
			||||||
                                        "info.everyone",
 | 
					                                        "everyone",
 | 
				
			||||||
                                        Tag.inserting(TranslatableCaption.of("info.everyone").toComponent(player))
 | 
					                                        Tag.inserting(TranslatableCaption.of("info.everyone").toComponent(player))
 | 
				
			||||||
                                );
 | 
					                                );
 | 
				
			||||||
                                builder.append(MINI_MESSAGE.deserialize(everyone, everyoneResolver));
 | 
					                                builder.append(MINI_MESSAGE.deserialize(everyone, everyoneResolver));
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2401,7 +2401,8 @@ public class SQLManager implements AbstractDB {
 | 
				
			|||||||
        addPlotTask(plot, new UniqueStatement("setPosition") {
 | 
					        addPlotTask(plot, new UniqueStatement("setPosition") {
 | 
				
			||||||
            @Override
 | 
					            @Override
 | 
				
			||||||
            public void set(PreparedStatement statement) throws SQLException {
 | 
					            public void set(PreparedStatement statement) throws SQLException {
 | 
				
			||||||
                statement.setString(1, position == null ? "" : position);
 | 
					                // Please see the table creation statement. There is the default value of "default"
 | 
				
			||||||
 | 
					                statement.setString(1, position == null ? "DEFAULT" : position);
 | 
				
			||||||
                statement.setInt(2, getId(plot));
 | 
					                statement.setInt(2, getId(plot));
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,17 +18,34 @@
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
package com.plotsquared.core.events;
 | 
					package com.plotsquared.core.events;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * PlotSquared event with {@link Result} to cancel, force, or allow.
 | 
					 * PlotSquared event with {@link Result} to cancel, force, or allow.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
public interface CancellablePlotEvent {
 | 
					public interface CancellablePlotEvent {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Result getEventResult();
 | 
					    /**
 | 
				
			||||||
 | 
					     * The currently set {@link Result} for this event (as set by potential previous event listeners).
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @return the current result.
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    @Nullable Result getEventResult();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    void setEventResult(Result eventResult);
 | 
					    /**
 | 
				
			||||||
 | 
					     * Set the {@link Result} for this event.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @param eventResult the new result.
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    void setEventResult(@Nullable Result eventResult);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * @deprecated No usage and not null-safe
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    @Deprecated(since = "7.3.2")
 | 
				
			||||||
    default int getEventResultRaw() {
 | 
					    default int getEventResultRaw() {
 | 
				
			||||||
        return getEventResult().getValue();
 | 
					        return getEventResult() != null ? getEventResult().getValue() : -1;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -0,0 +1,88 @@
 | 
				
			|||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * 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.events;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import com.plotsquared.core.player.PlotPlayer;
 | 
				
			||||||
 | 
					import com.plotsquared.core.plot.Plot;
 | 
				
			||||||
 | 
					import org.checkerframework.checker.index.qual.NonNegative;
 | 
				
			||||||
 | 
					import org.checkerframework.checker.nullness.qual.Nullable;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * Called when a user attempts to buy a plot.
 | 
				
			||||||
 | 
					 * <p>
 | 
				
			||||||
 | 
					 * Setting the {@link #setEventResult(Result) Result} to {@link Result#FORCE} ignores the price and players account balance and does not charge the
 | 
				
			||||||
 | 
					 * player anything. {@link Result#DENY} blocks the purchase completely, {@link Result#ACCEPT} and {@code null} do not modify
 | 
				
			||||||
 | 
					 * the behaviour.
 | 
				
			||||||
 | 
					 * <p>
 | 
				
			||||||
 | 
					 * Setting the {@link #setPrice(double) price} to {@code 0} makes the plot practically free.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * @since 7.3.2
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					public class PlayerBuyPlotEvent extends PlotPlayerEvent implements CancellablePlotEvent {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private Result result;
 | 
				
			||||||
 | 
					    private double price;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public PlayerBuyPlotEvent(final PlotPlayer<?> plotPlayer, final Plot plot, @NonNegative final double price) {
 | 
				
			||||||
 | 
					        super(plotPlayer, plot);
 | 
				
			||||||
 | 
					        this.price = price;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Sets the price required to buy the plot.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @param price the new price.
 | 
				
			||||||
 | 
					     * @since 7.3.2
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public void setPrice(@NonNegative final double price) {
 | 
				
			||||||
 | 
					        //noinspection ConstantValue - the annotation does not ensure a non-negative runtime value
 | 
				
			||||||
 | 
					        if (price < 0) {
 | 
				
			||||||
 | 
					            throw new IllegalArgumentException("price must be non-negative");
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        this.price = price;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Returns the currently set price required to buy the plot.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @return the price.
 | 
				
			||||||
 | 
					     * @since 7.3.2
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public @NonNegative double price() {
 | 
				
			||||||
 | 
					        return price;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * {@inheritDoc}
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    @Override
 | 
				
			||||||
 | 
					    public void setEventResult(@Nullable final Result eventResult) {
 | 
				
			||||||
 | 
					        this.result = eventResult;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * {@inheritDoc}
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    @Override
 | 
				
			||||||
 | 
					    public @Nullable Result getEventResult() {
 | 
				
			||||||
 | 
					        return this.result;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -0,0 +1,77 @@
 | 
				
			|||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * 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.events;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import com.plotsquared.core.player.PlotPlayer;
 | 
				
			||||||
 | 
					import org.checkerframework.checker.index.qual.NonNegative;
 | 
				
			||||||
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * Called every time after PlotSquared calculated a players plot limit based on their permission.
 | 
				
			||||||
 | 
					 * <p>
 | 
				
			||||||
 | 
					 * May be used to grant a player more plots based on another rank or bought feature.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * @since 7.3.0
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					public class PlayerPlotLimitEvent {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final PlotPlayer<?> player;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private int limit;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public PlayerPlotLimitEvent(@NonNull final PlotPlayer<?> player, @NonNegative final int limit) {
 | 
				
			||||||
 | 
					        this.player = player;
 | 
				
			||||||
 | 
					        this.limit = limit;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Overrides the previously calculated or set plot limit for {@link #player()}.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @param limit The amount of plots a player may claim. Must be {@code 0} or greater.
 | 
				
			||||||
 | 
					     * @since 7.3.0
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public void limit(@NonNegative final int limit) {
 | 
				
			||||||
 | 
					        if (limit < 0) {
 | 
				
			||||||
 | 
					            throw new IllegalArgumentException("Player plot limit must be greater or equal 0");
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        this.limit = limit;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Returns the previous set limit, if none was overridden before this event handler the default limit based on the players
 | 
				
			||||||
 | 
					     * permissions node is returned.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @return The currently defined plot limit of this player.
 | 
				
			||||||
 | 
					     * @since 7.3.0
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public @NonNegative int limit() {
 | 
				
			||||||
 | 
					        return limit;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * The player for which the limit is queried.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @return the player.
 | 
				
			||||||
 | 
					     * @since 7.3.0
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public @NonNull PlotPlayer<?> player() {
 | 
				
			||||||
 | 
					        return player;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -75,7 +75,7 @@ public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements Cancel
 | 
				
			|||||||
     * Gets the currently applied {@link UnaryOperator<Location> transformer} or null, if none was set
 | 
					     * Gets the currently applied {@link UnaryOperator<Location> transformer} or null, if none was set
 | 
				
			||||||
     *
 | 
					     *
 | 
				
			||||||
     * @return LocationTransformer
 | 
					     * @return LocationTransformer
 | 
				
			||||||
     * @since TODO
 | 
					     * @since 7.2.1
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    public @Nullable UnaryOperator<Location> getLocationTransformer() {
 | 
					    public @Nullable UnaryOperator<Location> getLocationTransformer() {
 | 
				
			||||||
        return this.locationTransformer;
 | 
					        return this.locationTransformer;
 | 
				
			||||||
@@ -86,7 +86,7 @@ public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements Cancel
 | 
				
			|||||||
     * May be {@code null}, if any previous set transformations should be discarded.
 | 
					     * May be {@code null}, if any previous set transformations should be discarded.
 | 
				
			||||||
     *
 | 
					     *
 | 
				
			||||||
     * @param locationTransformer The new transformer
 | 
					     * @param locationTransformer The new transformer
 | 
				
			||||||
     * @since TODO
 | 
					     * @since 7.2.1
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    public void setLocationTransformer(@Nullable UnaryOperator<Location> locationTransformer) {
 | 
					    public void setLocationTransformer(@Nullable UnaryOperator<Location> locationTransformer) {
 | 
				
			||||||
        this.locationTransformer = locationTransformer;
 | 
					        this.locationTransformer = locationTransformer;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -0,0 +1,64 @@
 | 
				
			|||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * 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.events.post;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import com.plotsquared.core.events.PlotPlayerEvent;
 | 
				
			||||||
 | 
					import com.plotsquared.core.player.OfflinePlotPlayer;
 | 
				
			||||||
 | 
					import com.plotsquared.core.player.PlotPlayer;
 | 
				
			||||||
 | 
					import com.plotsquared.core.plot.Plot;
 | 
				
			||||||
 | 
					import org.checkerframework.checker.index.qual.NonNegative;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * Called after a player has successfully bought a plot.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * @since 7.3.2
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					public class PostPlayerBuyPlotEvent extends PlotPlayerEvent {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private final OfflinePlotPlayer previousOwner;
 | 
				
			||||||
 | 
					    private final double price;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public PostPlayerBuyPlotEvent(
 | 
				
			||||||
 | 
					            final PlotPlayer<?> plotPlayer, final OfflinePlotPlayer previousOwner, final Plot plot,
 | 
				
			||||||
 | 
					            @NonNegative final double price
 | 
				
			||||||
 | 
					    ) {
 | 
				
			||||||
 | 
					        super(plotPlayer, plot);
 | 
				
			||||||
 | 
					        this.previousOwner = previousOwner;
 | 
				
			||||||
 | 
					        this.price = price;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * The previous owner of the bought plot.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @return the previous owner.
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public OfflinePlotPlayer previousOwner() {
 | 
				
			||||||
 | 
					        return previousOwner;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Returns the price after potential modifications by {@link com.plotsquared.core.events.PlayerBuyPlotEvent}.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @return the price the player had to pay to buy the plot.
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public double price() {
 | 
				
			||||||
 | 
					        return price;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -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.events.post;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import com.plotsquared.core.events.PlotPlayerEvent;
 | 
				
			||||||
 | 
					import com.plotsquared.core.player.PlotPlayer;
 | 
				
			||||||
 | 
					import com.plotsquared.core.plot.Plot;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * Called after a {@link Plot} was cleared.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * @since 7.3.2
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					public class PostPlotClearEvent extends PlotPlayerEvent {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Instantiate a new PostPlotClearEvent.
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @param plotPlayer The {@link PlotPlayer} that initiated the clear.
 | 
				
			||||||
 | 
					     * @param plot       The clearing plot.
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public PostPlotClearEvent(final PlotPlayer<?> plotPlayer, final Plot plot) {
 | 
				
			||||||
 | 
					        super(plotPlayer, plot);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -143,7 +143,7 @@ public class ClassicPlotManager extends SquarePlotManager {
 | 
				
			|||||||
                    classicPlotWorld,
 | 
					                    classicPlotWorld,
 | 
				
			||||||
                    plot.getRegions(),
 | 
					                    plot.getRegions(),
 | 
				
			||||||
                    blocks,
 | 
					                    blocks,
 | 
				
			||||||
                    classicPlotWorld.getMinBuildHeight(),
 | 
					                    classicPlotWorld.getMinComponentHeight(),
 | 
				
			||||||
                    classicPlotWorld.getMaxBuildHeight() - 1,
 | 
					                    classicPlotWorld.getMaxBuildHeight() - 1,
 | 
				
			||||||
                    actor,
 | 
					                    actor,
 | 
				
			||||||
                    queue
 | 
					                    queue
 | 
				
			||||||
@@ -204,7 +204,7 @@ public class ClassicPlotManager extends SquarePlotManager {
 | 
				
			|||||||
                    classicPlotWorld,
 | 
					                    classicPlotWorld,
 | 
				
			||||||
                    plot.getRegions(),
 | 
					                    plot.getRegions(),
 | 
				
			||||||
                    blocks,
 | 
					                    blocks,
 | 
				
			||||||
                    classicPlotWorld.getMinBuildHeight(),
 | 
					                    classicPlotWorld.getMinComponentHeight(),
 | 
				
			||||||
                    classicPlotWorld.PLOT_HEIGHT - 1,
 | 
					                    classicPlotWorld.PLOT_HEIGHT - 1,
 | 
				
			||||||
                    actor,
 | 
					                    actor,
 | 
				
			||||||
                    queue
 | 
					                    queue
 | 
				
			||||||
@@ -379,7 +379,7 @@ public class ClassicPlotManager extends SquarePlotManager {
 | 
				
			|||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        int yStart = classicPlotWorld.getMinBuildHeight() + (classicPlotWorld.PLOT_BEDROCK ? 1 : 0);
 | 
					        int yStart = classicPlotWorld.getMinComponentHeight();
 | 
				
			||||||
        if (!plot.isMerged(Direction.NORTH)) {
 | 
					        if (!plot.isMerged(Direction.NORTH)) {
 | 
				
			||||||
            int z = bot.getZ();
 | 
					            int z = bot.getZ();
 | 
				
			||||||
            for (int x = bot.getX(); x < top.getX(); x++) {
 | 
					            for (int x = bot.getX(); x < top.getX(); x++) {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -52,6 +52,7 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
 | 
				
			|||||||
    public BlockBucket ROAD_BLOCK = new BlockBucket(BlockTypes.QUARTZ_BLOCK);
 | 
					    public BlockBucket ROAD_BLOCK = new BlockBucket(BlockTypes.QUARTZ_BLOCK);
 | 
				
			||||||
    public boolean PLOT_BEDROCK = true;
 | 
					    public boolean PLOT_BEDROCK = true;
 | 
				
			||||||
    public boolean PLACE_TOP_BLOCK = true;
 | 
					    public boolean PLACE_TOP_BLOCK = true;
 | 
				
			||||||
 | 
					    public boolean COMPONENT_BELOW_BEDROCK = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public ClassicPlotWorld(
 | 
					    public ClassicPlotWorld(
 | 
				
			||||||
            final @NonNull String worldName,
 | 
					            final @NonNull String worldName,
 | 
				
			||||||
@@ -129,6 +130,9 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
 | 
				
			|||||||
                ),
 | 
					                ),
 | 
				
			||||||
                new ConfigurationNode("plot.bedrock", this.PLOT_BEDROCK, TranslatableCaption.of("setup.bedrock_boolean"),
 | 
					                new ConfigurationNode("plot.bedrock", this.PLOT_BEDROCK, TranslatableCaption.of("setup.bedrock_boolean"),
 | 
				
			||||||
                        ConfigurationUtil.BOOLEAN
 | 
					                        ConfigurationUtil.BOOLEAN
 | 
				
			||||||
 | 
					                ),
 | 
				
			||||||
 | 
					                new ConfigurationNode("world.component_below_bedrock", this.COMPONENT_BELOW_BEDROCK, TranslatableCaption.of(
 | 
				
			||||||
 | 
					                        "setup.component_below_bedrock_boolean"), ConfigurationUtil.BOOLEAN
 | 
				
			||||||
                )};
 | 
					                )};
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -150,6 +154,14 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
 | 
				
			|||||||
        this.PLACE_TOP_BLOCK = config.getBoolean("wall.place_top_block");
 | 
					        this.PLACE_TOP_BLOCK = config.getBoolean("wall.place_top_block");
 | 
				
			||||||
        this.WALL_HEIGHT = Math.min(getMaxGenHeight() - (PLACE_TOP_BLOCK ? 1 : 0), config.getInt("wall.height"));
 | 
					        this.WALL_HEIGHT = Math.min(getMaxGenHeight() - (PLACE_TOP_BLOCK ? 1 : 0), config.getInt("wall.height"));
 | 
				
			||||||
        this.CLAIMED_WALL_BLOCK = createCheckedBlockBucket(config.getString("wall.block_claimed"), CLAIMED_WALL_BLOCK);
 | 
					        this.CLAIMED_WALL_BLOCK = createCheckedBlockBucket(config.getString("wall.block_claimed"), CLAIMED_WALL_BLOCK);
 | 
				
			||||||
 | 
					        this.COMPONENT_BELOW_BEDROCK = config.getBoolean("world.component_below_bedrock");
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Override
 | 
				
			||||||
 | 
					    public int getMinComponentHeight() {
 | 
				
			||||||
 | 
					        return COMPONENT_BELOW_BEDROCK && getMinGenHeight() >= getMinBuildHeight()
 | 
				
			||||||
 | 
					                ? getMinGenHeight() + (PLOT_BEDROCK ? 1 : 0)
 | 
				
			||||||
 | 
					                : getMinBuildHeight();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    int schematicStartHeight() {
 | 
					    int schematicStartHeight() {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -364,7 +364,6 @@ public class PlotListener {
 | 
				
			|||||||
    public boolean plotExit(final PlotPlayer<?> player, Plot plot) {
 | 
					    public boolean plotExit(final PlotPlayer<?> player, Plot plot) {
 | 
				
			||||||
        try (final MetaDataAccess<Plot> lastPlot = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
 | 
					        try (final MetaDataAccess<Plot> lastPlot = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
 | 
				
			||||||
            final Plot previous = lastPlot.remove();
 | 
					            final Plot previous = lastPlot.remove();
 | 
				
			||||||
            this.eventDispatcher.callLeave(player, plot);
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
            List<StatusEffect> effects = playerEffects.remove(player.getUUID());
 | 
					            List<StatusEffect> effects = playerEffects.remove(player.getUUID());
 | 
				
			||||||
            if (effects != null) {
 | 
					            if (effects != null) {
 | 
				
			||||||
@@ -467,6 +466,8 @@ public class PlotListener {
 | 
				
			|||||||
                feedRunnable.remove(player.getUUID());
 | 
					                feedRunnable.remove(player.getUUID());
 | 
				
			||||||
                healRunnable.remove(player.getUUID());
 | 
					                healRunnable.remove(player.getUUID());
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					        } finally {
 | 
				
			||||||
 | 
					            this.eventDispatcher.callLeave(player, plot);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        return true;
 | 
					        return true;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -59,6 +59,9 @@ public enum Permission implements ComponentLike {
 | 
				
			|||||||
    PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED("plots.admin.vehicle.break.unowned"),
 | 
					    PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED("plots.admin.vehicle.break.unowned"),
 | 
				
			||||||
    PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER("plots.admin.vehicle.break.other"),
 | 
					    PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER("plots.admin.vehicle.break.other"),
 | 
				
			||||||
    PERMISSION_ADMIN_PVE("plots.admin.pve"),
 | 
					    PERMISSION_ADMIN_PVE("plots.admin.pve"),
 | 
				
			||||||
 | 
					    PERMISSION_ADMIN_PLACE_VEHICLE_ROAD("plots.admin.vehicle.place.road"),
 | 
				
			||||||
 | 
					    PERMISSION_ADMIN_PLACE_VEHICLE_UNOWNED("plots.admin.vehicle.place.unowned"),
 | 
				
			||||||
 | 
					    PERMISSION_ADMIN_PLACE_VEHICLE_OTHER("plots.admin.vehicle.place.other"),
 | 
				
			||||||
    PERMISSION_ADMIN_PVP("plots.admin.pvp"),
 | 
					    PERMISSION_ADMIN_PVP("plots.admin.pvp"),
 | 
				
			||||||
    PERMISSION_ADMIN_BUILD_ROAD("plots.admin.build.road"),
 | 
					    PERMISSION_ADMIN_BUILD_ROAD("plots.admin.build.road"),
 | 
				
			||||||
    PERMISSION_ADMIN_PROJECTILE_ROAD("plots.admin.projectile.road"),
 | 
					    PERMISSION_ADMIN_PROJECTILE_ROAD("plots.admin.projectile.road"),
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -306,7 +306,8 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 | 
				
			|||||||
     * @return number of allowed plots within the scope (globally, or in the player's current world as defined in the settings.yml)
 | 
					     * @return number of allowed plots within the scope (globally, or in the player's current world as defined in the settings.yml)
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
    public int getAllowedPlots() {
 | 
					    public int getAllowedPlots() {
 | 
				
			||||||
        return hasPermissionRange("plots.plot", Settings.Limit.MAX_PLOTS);
 | 
					        final int calculatedLimit = hasPermissionRange("plots.plot", Settings.Limit.MAX_PLOTS);
 | 
				
			||||||
 | 
					        return this.eventDispatcher.callPlayerPlotLimit(this, calculatedLimit).limit();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1483,7 +1483,7 @@ public class Plot {
 | 
				
			|||||||
     */
 | 
					     */
 | 
				
			||||||
    public void setHome(BlockLoc location) {
 | 
					    public void setHome(BlockLoc location) {
 | 
				
			||||||
        Plot plot = this.getBasePlot(false);
 | 
					        Plot plot = this.getBasePlot(false);
 | 
				
			||||||
        if (BlockLoc.ZERO.equals(location) || BlockLoc.MINY.equals(location)) {
 | 
					        if (location != null && (BlockLoc.ZERO.equals(location) || BlockLoc.MINY.equals(location))) {
 | 
				
			||||||
            return;
 | 
					            return;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        plot.getSettings().setPosition(location);
 | 
					        plot.getSettings().setPosition(location);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1452,6 +1452,24 @@ public abstract class PlotArea implements ComponentLike {
 | 
				
			|||||||
        this.defaultHome = defaultHome;
 | 
					        this.defaultHome = defaultHome;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Get the maximum height that changes to plot components (wall filling, air, all etc.) may operate to
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @since TODO
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public int getMaxComponentHeight() {
 | 
				
			||||||
 | 
					        return this.maxBuildHeight;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Get the minimum height that changes to plot components (wall filling, air, all etc.) may operate to
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @since TODO
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					    public int getMinComponentHeight() {
 | 
				
			||||||
 | 
					        return this.minBuildHeight;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * Get the maximum height players may build in. Exclusive.
 | 
					     * Get the maximum height players may build in. Exclusive.
 | 
				
			||||||
     */
 | 
					     */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -89,6 +89,7 @@ import com.plotsquared.core.plot.flag.implementations.PlayerInteractFlag;
 | 
				
			|||||||
import com.plotsquared.core.plot.flag.implementations.PlotTitleFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.PlotTitleFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.PreventCreativeCopyFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.PreventCreativeCopyFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.PriceFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.PriceFlag;
 | 
				
			||||||
 | 
					import com.plotsquared.core.plot.flag.implementations.ProjectileChangeBlockFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.PveFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.PveFlag;
 | 
				
			||||||
import com.plotsquared.core.plot.flag.implementations.PvpFlag;
 | 
					import com.plotsquared.core.plot.flag.implementations.PvpFlag;
 | 
				
			||||||
@@ -185,6 +186,7 @@ public final class GlobalFlagContainer extends FlagContainer {
 | 
				
			|||||||
        this.addFlag(NoWorldeditFlag.NO_WORLDEDIT_FALSE);
 | 
					        this.addFlag(NoWorldeditFlag.NO_WORLDEDIT_FALSE);
 | 
				
			||||||
        this.addFlag(PlayerInteractFlag.PLAYER_INTERACT_FALSE);
 | 
					        this.addFlag(PlayerInteractFlag.PLAYER_INTERACT_FALSE);
 | 
				
			||||||
        this.addFlag(PreventCreativeCopyFlag.PREVENT_CREATIVE_COPY_FALSE);
 | 
					        this.addFlag(PreventCreativeCopyFlag.PREVENT_CREATIVE_COPY_FALSE);
 | 
				
			||||||
 | 
					        this.addFlag(ProjectileChangeBlockFlag.PROJECTILE_CHANGE_BLOCK_FALSE);
 | 
				
			||||||
        this.addFlag(PveFlag.PVE_FALSE);
 | 
					        this.addFlag(PveFlag.PVE_FALSE);
 | 
				
			||||||
        this.addFlag(PvpFlag.PVP_FALSE);
 | 
					        this.addFlag(PvpFlag.PVP_FALSE);
 | 
				
			||||||
        this.addFlag(RedstoneFlag.REDSTONE_TRUE);
 | 
					        this.addFlag(RedstoneFlag.REDSTONE_TRUE);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,7 +23,7 @@ import com.plotsquared.core.plot.flag.types.BooleanFlag;
 | 
				
			|||||||
import org.checkerframework.checker.nullness.qual.NonNull;
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * @since TODO
 | 
					 * @since 7.2.1
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
public class EditSignFlag extends BooleanFlag<EditSignFlag> {
 | 
					public class EditSignFlag extends BooleanFlag<EditSignFlag> {
 | 
				
			||||||
    public static final EditSignFlag EDIT_SIGN_TRUE = new EditSignFlag(true);
 | 
					    public static final EditSignFlag EDIT_SIGN_TRUE = new EditSignFlag(true);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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 ProjectileChangeBlockFlag extends BooleanFlag<ProjectileChangeBlockFlag> {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public static final ProjectileChangeBlockFlag PROJECTILE_CHANGE_BLOCK_TRUE = new ProjectileChangeBlockFlag(true);
 | 
				
			||||||
 | 
					    public static final ProjectileChangeBlockFlag PROJECTILE_CHANGE_BLOCK_FALSE = new ProjectileChangeBlockFlag(false);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    private ProjectileChangeBlockFlag(boolean value) {
 | 
				
			||||||
 | 
					        super(value, TranslatableCaption.of("flags.flag_description_projectile_change_block"));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Override
 | 
				
			||||||
 | 
					    protected ProjectileChangeBlockFlag flagOf(@NonNull Boolean value) {
 | 
				
			||||||
 | 
					        return value ? PROJECTILE_CHANGE_BLOCK_TRUE : PROJECTILE_CHANGE_BLOCK_FALSE;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -25,11 +25,13 @@ import com.plotsquared.core.configuration.Settings;
 | 
				
			|||||||
import com.plotsquared.core.configuration.caption.TranslatableCaption;
 | 
					import com.plotsquared.core.configuration.caption.TranslatableCaption;
 | 
				
			||||||
import com.plotsquared.core.events.PlayerAutoPlotEvent;
 | 
					import com.plotsquared.core.events.PlayerAutoPlotEvent;
 | 
				
			||||||
import com.plotsquared.core.events.PlayerAutoPlotsChosenEvent;
 | 
					import com.plotsquared.core.events.PlayerAutoPlotsChosenEvent;
 | 
				
			||||||
 | 
					import com.plotsquared.core.events.PlayerBuyPlotEvent;
 | 
				
			||||||
import com.plotsquared.core.events.PlayerClaimPlotEvent;
 | 
					import com.plotsquared.core.events.PlayerClaimPlotEvent;
 | 
				
			||||||
import com.plotsquared.core.events.PlayerEnterPlotEvent;
 | 
					import com.plotsquared.core.events.PlayerEnterPlotEvent;
 | 
				
			||||||
import com.plotsquared.core.events.PlayerLeavePlotEvent;
 | 
					import com.plotsquared.core.events.PlayerLeavePlotEvent;
 | 
				
			||||||
import com.plotsquared.core.events.PlayerPlotDeniedEvent;
 | 
					import com.plotsquared.core.events.PlayerPlotDeniedEvent;
 | 
				
			||||||
import com.plotsquared.core.events.PlayerPlotHelperEvent;
 | 
					import com.plotsquared.core.events.PlayerPlotHelperEvent;
 | 
				
			||||||
 | 
					import com.plotsquared.core.events.PlayerPlotLimitEvent;
 | 
				
			||||||
import com.plotsquared.core.events.PlayerPlotTrustedEvent;
 | 
					import com.plotsquared.core.events.PlayerPlotTrustedEvent;
 | 
				
			||||||
import com.plotsquared.core.events.PlayerTeleportToPlotEvent;
 | 
					import com.plotsquared.core.events.PlayerTeleportToPlotEvent;
 | 
				
			||||||
import com.plotsquared.core.events.PlotAutoMergeEvent;
 | 
					import com.plotsquared.core.events.PlotAutoMergeEvent;
 | 
				
			||||||
@@ -48,7 +50,9 @@ import com.plotsquared.core.events.PlotUnlinkEvent;
 | 
				
			|||||||
import com.plotsquared.core.events.RemoveRoadEntityEvent;
 | 
					import com.plotsquared.core.events.RemoveRoadEntityEvent;
 | 
				
			||||||
import com.plotsquared.core.events.TeleportCause;
 | 
					import com.plotsquared.core.events.TeleportCause;
 | 
				
			||||||
import com.plotsquared.core.events.post.PostPlayerAutoPlotEvent;
 | 
					import com.plotsquared.core.events.post.PostPlayerAutoPlotEvent;
 | 
				
			||||||
 | 
					import com.plotsquared.core.events.post.PostPlayerBuyPlotEvent;
 | 
				
			||||||
import com.plotsquared.core.events.post.PostPlotChangeOwnerEvent;
 | 
					import com.plotsquared.core.events.post.PostPlotChangeOwnerEvent;
 | 
				
			||||||
 | 
					import com.plotsquared.core.events.post.PostPlotClearEvent;
 | 
				
			||||||
import com.plotsquared.core.events.post.PostPlotDeleteEvent;
 | 
					import com.plotsquared.core.events.post.PostPlotDeleteEvent;
 | 
				
			||||||
import com.plotsquared.core.events.post.PostPlotMergeEvent;
 | 
					import com.plotsquared.core.events.post.PostPlotMergeEvent;
 | 
				
			||||||
import com.plotsquared.core.events.post.PostPlotUnlinkEvent;
 | 
					import com.plotsquared.core.events.post.PostPlotUnlinkEvent;
 | 
				
			||||||
@@ -56,6 +60,7 @@ import com.plotsquared.core.listener.PlayerBlockEventType;
 | 
				
			|||||||
import com.plotsquared.core.location.Direction;
 | 
					import com.plotsquared.core.location.Direction;
 | 
				
			||||||
import com.plotsquared.core.location.Location;
 | 
					import com.plotsquared.core.location.Location;
 | 
				
			||||||
import com.plotsquared.core.permissions.Permission;
 | 
					import com.plotsquared.core.permissions.Permission;
 | 
				
			||||||
 | 
					import com.plotsquared.core.player.OfflinePlotPlayer;
 | 
				
			||||||
import com.plotsquared.core.player.PlotPlayer;
 | 
					import com.plotsquared.core.player.PlotPlayer;
 | 
				
			||||||
import com.plotsquared.core.plot.Plot;
 | 
					import com.plotsquared.core.plot.Plot;
 | 
				
			||||||
import com.plotsquared.core.plot.PlotArea;
 | 
					import com.plotsquared.core.plot.PlotArea;
 | 
				
			||||||
@@ -178,6 +183,12 @@ public class EventDispatcher {
 | 
				
			|||||||
        return event;
 | 
					        return event;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public PostPlotClearEvent callPostPlotClear(PlotPlayer<?> player, Plot plot) {
 | 
				
			||||||
 | 
					        PostPlotClearEvent event = new PostPlotClearEvent(player, plot);
 | 
				
			||||||
 | 
					        callEvent(event);
 | 
				
			||||||
 | 
					        return event;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public PlotDeleteEvent callDelete(Plot plot) {
 | 
					    public PlotDeleteEvent callDelete(Plot plot) {
 | 
				
			||||||
        PlotDeleteEvent event = new PlotDeleteEvent(plot);
 | 
					        PlotDeleteEvent event = new PlotDeleteEvent(plot);
 | 
				
			||||||
        callEvent(event);
 | 
					        callEvent(event);
 | 
				
			||||||
@@ -308,6 +319,23 @@ public class EventDispatcher {
 | 
				
			|||||||
        return event;
 | 
					        return event;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public PlayerPlotLimitEvent callPlayerPlotLimit(PlotPlayer<?> player, int calculatedLimit) {
 | 
				
			||||||
 | 
					        PlayerPlotLimitEvent event = new PlayerPlotLimitEvent(player, calculatedLimit);
 | 
				
			||||||
 | 
					        eventBus.post(event);
 | 
				
			||||||
 | 
					        return event;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public PlayerBuyPlotEvent callPlayerBuyPlot(PlotPlayer<?> player, Plot plot, double price) {
 | 
				
			||||||
 | 
					        PlayerBuyPlotEvent event = new PlayerBuyPlotEvent(player, plot, price);
 | 
				
			||||||
 | 
					        eventBus.post(event);
 | 
				
			||||||
 | 
					        return event;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public void callPostPlayerBuyPlot(PlotPlayer<?> player, OfflinePlotPlayer previousOwner, Plot plot,
 | 
				
			||||||
 | 
					                                      double price) {
 | 
				
			||||||
 | 
					        eventBus.post(new PostPlayerBuyPlotEvent(player, previousOwner, plot, price));
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public void doJoinTask(final PlotPlayer<?> player) {
 | 
					    public void doJoinTask(final PlotPlayer<?> player) {
 | 
				
			||||||
        if (player == null) {
 | 
					        if (player == null) {
 | 
				
			||||||
            return; //possible future warning message to figure out where we are retrieving null
 | 
					            return; //possible future warning message to figure out where we are retrieving null
 | 
				
			||||||
@@ -375,14 +403,10 @@ public class EventDispatcher {
 | 
				
			|||||||
                            return true;
 | 
					                            return true;
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                    return player.hasPermission(
 | 
					                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
 | 
				
			||||||
                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
 | 
					 | 
				
			||||||
                    );
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (!plot.hasOwner()) {
 | 
					                if (!plot.hasOwner()) {
 | 
				
			||||||
                    return player.hasPermission(
 | 
					                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
 | 
				
			||||||
                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
 | 
					 | 
				
			||||||
                    );
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                final List<BlockTypeWrapper> use = plot.getFlag(UseFlag.class);
 | 
					                final List<BlockTypeWrapper> use = plot.getFlag(UseFlag.class);
 | 
				
			||||||
                for (final BlockTypeWrapper blockTypeWrapper : use) {
 | 
					                for (final BlockTypeWrapper blockTypeWrapper : use) {
 | 
				
			||||||
@@ -391,7 +415,7 @@ public class EventDispatcher {
 | 
				
			|||||||
                        return true;
 | 
					                        return true;
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), false)) {
 | 
					                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false)) {
 | 
				
			||||||
                    return true;
 | 
					                    return true;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                // we check for the EditSignFlag in the PlayerSignOpenEvent again, but we must not cancel the interact event
 | 
					                // we check for the EditSignFlag in the PlayerSignOpenEvent again, but we must not cancel the interact event
 | 
				
			||||||
@@ -416,14 +440,10 @@ public class EventDispatcher {
 | 
				
			|||||||
                            return true;
 | 
					                            return true;
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                    return player.hasPermission(
 | 
					                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, false);
 | 
				
			||||||
                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), false
 | 
					 | 
				
			||||||
                    );
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (!plot.hasOwner()) {
 | 
					                if (!plot.hasOwner()) {
 | 
				
			||||||
                    return player.hasPermission(
 | 
					                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, false);
 | 
				
			||||||
                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), false
 | 
					 | 
				
			||||||
                    );
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (plot.getFlag(DeviceInteractFlag.class)) {
 | 
					                if (plot.getFlag(DeviceInteractFlag.class)) {
 | 
				
			||||||
                    return true;
 | 
					                    return true;
 | 
				
			||||||
@@ -435,21 +455,14 @@ public class EventDispatcher {
 | 
				
			|||||||
                        return true;
 | 
					                        return true;
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                return player.hasPermission(
 | 
					                return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false);
 | 
				
			||||||
                        Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
 | 
					 | 
				
			||||||
                        false
 | 
					 | 
				
			||||||
                );
 | 
					 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            case SPAWN_MOB -> {
 | 
					            case SPAWN_MOB -> {
 | 
				
			||||||
                if (plot == null) {
 | 
					                if (plot == null) {
 | 
				
			||||||
                    return player.hasPermission(
 | 
					                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
 | 
				
			||||||
                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
 | 
					 | 
				
			||||||
                    );
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (!plot.hasOwner()) {
 | 
					                if (!plot.hasOwner()) {
 | 
				
			||||||
                    return player.hasPermission(
 | 
					                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
 | 
				
			||||||
                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
 | 
					 | 
				
			||||||
                    );
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (plot.getFlag(MobPlaceFlag.class)) {
 | 
					                if (plot.getFlag(MobPlaceFlag.class)) {
 | 
				
			||||||
                    return true;
 | 
					                    return true;
 | 
				
			||||||
@@ -461,10 +474,7 @@ public class EventDispatcher {
 | 
				
			|||||||
                        return true;
 | 
					                        return true;
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (player.hasPermission(
 | 
					                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false)) {
 | 
				
			||||||
                        Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
 | 
					 | 
				
			||||||
                        false
 | 
					 | 
				
			||||||
                )) {
 | 
					 | 
				
			||||||
                    return true;
 | 
					                    return true;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (notifyPerms) {
 | 
					                if (notifyPerms) {
 | 
				
			||||||
@@ -484,14 +494,10 @@ public class EventDispatcher {
 | 
				
			|||||||
            }
 | 
					            }
 | 
				
			||||||
            case PLACE_MISC -> {
 | 
					            case PLACE_MISC -> {
 | 
				
			||||||
                if (plot == null) {
 | 
					                if (plot == null) {
 | 
				
			||||||
                    return player.hasPermission(
 | 
					                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
 | 
				
			||||||
                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
 | 
					 | 
				
			||||||
                    );
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (!plot.hasOwner()) {
 | 
					                if (!plot.hasOwner()) {
 | 
				
			||||||
                    return player.hasPermission(
 | 
					                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
 | 
				
			||||||
                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
 | 
					 | 
				
			||||||
                    );
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (plot.getFlag(MiscPlaceFlag.class)) {
 | 
					                if (plot.getFlag(MiscPlaceFlag.class)) {
 | 
				
			||||||
                    return true;
 | 
					                    return true;
 | 
				
			||||||
@@ -503,10 +509,7 @@ public class EventDispatcher {
 | 
				
			|||||||
                        return true;
 | 
					                        return true;
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (player.hasPermission(
 | 
					                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false)) {
 | 
				
			||||||
                        Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
 | 
					 | 
				
			||||||
                        false
 | 
					 | 
				
			||||||
                )) {
 | 
					 | 
				
			||||||
                    return true;
 | 
					                    return true;
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (notifyPerms) {
 | 
					                if (notifyPerms) {
 | 
				
			||||||
@@ -526,16 +529,28 @@ public class EventDispatcher {
 | 
				
			|||||||
            }
 | 
					            }
 | 
				
			||||||
            case PLACE_VEHICLE -> {
 | 
					            case PLACE_VEHICLE -> {
 | 
				
			||||||
                if (plot == null) {
 | 
					                if (plot == null) {
 | 
				
			||||||
                    return player.hasPermission(
 | 
					                    return player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_ROAD, notifyPerms);
 | 
				
			||||||
                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
 | 
					 | 
				
			||||||
                    );
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if (!plot.hasOwner()) {
 | 
					                if (!plot.hasOwner()) {
 | 
				
			||||||
                    return player.hasPermission(
 | 
					                    return player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_UNOWNED, notifyPerms);
 | 
				
			||||||
                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
 | 
					                }
 | 
				
			||||||
 | 
					                if (plot.getFlag(VehiclePlaceFlag.class)) {
 | 
				
			||||||
 | 
					                    return true;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                if (player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_OTHER, false)) {
 | 
				
			||||||
 | 
					                    return true;
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					                if (notifyPerms) {
 | 
				
			||||||
 | 
					                    player.sendMessage(
 | 
				
			||||||
 | 
					                            TranslatableCaption.of("commandconfig.flag_tutorial_usage"),
 | 
				
			||||||
 | 
					                            TagResolver.resolver(
 | 
				
			||||||
 | 
					                                    "flag",
 | 
				
			||||||
 | 
					                                    Tag.inserting(
 | 
				
			||||||
 | 
					                                            PlotFlag.getFlagNameComponent(VehiclePlaceFlag.class)
 | 
				
			||||||
 | 
					                                    )
 | 
				
			||||||
 | 
					                            )
 | 
				
			||||||
                    );
 | 
					                    );
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                return plot.getFlag(VehiclePlaceFlag.class);
 | 
					 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            default -> {
 | 
					            default -> {
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -0,0 +1,31 @@
 | 
				
			|||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * 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.util.query;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import com.plotsquared.core.plot.Plot;
 | 
				
			||||||
 | 
					import org.checkerframework.checker.nullness.qual.NonNull;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class HasOwnerFilter implements PlotFilter {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Override
 | 
				
			||||||
 | 
					    public boolean accepts(final @NonNull Plot plot) {
 | 
				
			||||||
 | 
					        return plot.hasOwner();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -219,6 +219,16 @@ public final class PlotQuery implements Iterable<Plot> {
 | 
				
			|||||||
        return this.addFilter(new OwnersIncludeFilter(owner.getUUID()));
 | 
					        return this.addFilter(new OwnersIncludeFilter(owner.getUUID()));
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    /**
 | 
				
			||||||
 | 
					     * Query only for plots that have an owner
 | 
				
			||||||
 | 
					     *
 | 
				
			||||||
 | 
					     * @return The query instance
 | 
				
			||||||
 | 
					     * @since 7.2.1
 | 
				
			||||||
 | 
					     */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    public @NonNull PlotQuery hasOwner() {
 | 
				
			||||||
 | 
					        return this.addFilter(new HasOwnerFilter());
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
    /**
 | 
					    /**
 | 
				
			||||||
     * Query for plots with a specific alias
 | 
					     * Query for plots with a specific alias
 | 
				
			||||||
     *
 | 
					     *
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -125,6 +125,7 @@
 | 
				
			|||||||
  "economy.added_balance": "<prefix><gold><money> </gold><gray>has been added to your balance.</gray>",
 | 
					  "economy.added_balance": "<prefix><gold><money> </gold><gray>has been added to your balance.</gray>",
 | 
				
			||||||
  "economy.removed_balance": "<prefix><gold><money> </gold><gray>has been taken from your balance.</gray>",
 | 
					  "economy.removed_balance": "<prefix><gold><money> </gold><gray>has been taken from your balance.</gray>",
 | 
				
			||||||
  "economy.removed_granted_plot": "<prefix><gray>You used <used_grants> plot grant(s), you've got </gray><gold><remaining_grants></gold> <gray>left.</gray>",
 | 
					  "economy.removed_granted_plot": "<prefix><gray>You used <used_grants> plot grant(s), you've got </gray><gold><remaining_grants></gold> <gray>left.</gray>",
 | 
				
			||||||
 | 
					  "economy.cannot_buy_blocked":  "<prefix><red>You are not allowed to buy this plot.</red>",
 | 
				
			||||||
  "setup.choose_generator": "<gold>What generator do you want?</gold>",
 | 
					  "setup.choose_generator": "<gold>What generator do you want?</gold>",
 | 
				
			||||||
  "setup.setup_not_started": "<prefix><gold>No setup started.</gold>",
 | 
					  "setup.setup_not_started": "<prefix><gold>No setup started.</gold>",
 | 
				
			||||||
  "setup.setup_init": "<prefix><gold>Usage: </gold><gray>/plot setup <value></gray>",
 | 
					  "setup.setup_init": "<prefix><gold>Usage: </gold><gray>/plot setup <value></gray>",
 | 
				
			||||||
@@ -165,6 +166,7 @@
 | 
				
			|||||||
  "setup.wall_height": "<gold>Wall height</gold>",
 | 
					  "setup.wall_height": "<gold>Wall height</gold>",
 | 
				
			||||||
  "setup.min_gen_height": "<gold>Minimum height from which to generate (for 1.18+ can be negative).</gold>",
 | 
					  "setup.min_gen_height": "<gold>Minimum height from which to generate (for 1.18+ can be negative).</gold>",
 | 
				
			||||||
  "setup.bedrock_boolean": "<gold>Whether a bedrock layer under the plot should be generated or not</gold>",
 | 
					  "setup.bedrock_boolean": "<gold>Whether a bedrock layer under the plot should be generated or not</gold>",
 | 
				
			||||||
 | 
					  "setup.component_below_bedrock_boolean": "<gold>Whether a component change e.g. /plot set walls should edit the bedrock layer or below</gold>",
 | 
				
			||||||
  "setup.singleplotarea_void_world": "<gold>Void world</gold>",
 | 
					  "setup.singleplotarea_void_world": "<gold>Void world</gold>",
 | 
				
			||||||
  "plotareatype.plot_area_type_normal": "<gray>Standard plot generation</gray>",
 | 
					  "plotareatype.plot_area_type_normal": "<gray>Standard plot generation</gray>",
 | 
				
			||||||
  "plotareatype.plot_area_type_augmented": "<gray>Plot generation with vanilla terrain</gray>",
 | 
					  "plotareatype.plot_area_type_augmented": "<gray>Plot generation with vanilla terrain</gray>",
 | 
				
			||||||
@@ -248,11 +250,11 @@
 | 
				
			|||||||
  "condense.skipping": "<prefix><red>Skipping complex plot: </red><gold><plot></gold><red>.</red>",
 | 
					  "condense.skipping": "<prefix><red>Skipping complex plot: </red><gold><plot></gold><red>.</red>",
 | 
				
			||||||
  "condense.task_stopped": "<prefix><gold>Task already stopped.</gold>",
 | 
					  "condense.task_stopped": "<prefix><gold>Task already stopped.</gold>",
 | 
				
			||||||
  "condense.default_eval": "<dark_gray><strikethrough>=== <reset> <gold>DEFAULT EVAL </gold><dark_gray><strikethrough>===</dark_gray>",
 | 
					  "condense.default_eval": "<dark_gray><strikethrough>=== <reset> <gold>DEFAULT EVAL </gold><dark_gray><strikethrough>===</dark_gray>",
 | 
				
			||||||
  "condense.minimum_radius": "<gold>Minimum radius: </gold><gray><minimumRadius></gray>",
 | 
					  "condense.minimum_radius": "<gold>Minimum radius: </gold><gray><minimum_radius></gray>",
 | 
				
			||||||
  "condense.maximum_moved": "<gold>Maximum moved: </gold><gray><maximumMoves></gray>",
 | 
					  "condense.maximum_moved": "<gold>Maximum moved: </gold><gray><maximum_moves></gray>",
 | 
				
			||||||
  "condense.input_eval": "<dark_gray><strikethrough>=== <reset> <gold>INPUT EVAL </gold><dark_gray><strikethrough>===</dark_gray>",
 | 
					  "condense.input_eval": "<dark_gray><strikethrough>=== <reset> <gold>INPUT EVAL </gold><dark_gray><strikethrough>===</dark_gray>",
 | 
				
			||||||
  "condense.input_radius": "<gold>Input radius: </gold><gray><radius></gray>",
 | 
					  "condense.input_radius": "<gold>Input radius: </gold><gray><radius></gray>",
 | 
				
			||||||
  "condense.estimated_moves": "<gold>Estimated moves: </gold><gray><userMove></gray>",
 | 
					  "condense.estimated_moves": "<gold>Estimated moves: </gold><gray><user_move></gray>",
 | 
				
			||||||
  "condense.eta": "<prefix><gold>Estimated time: No idea, times will drastically change based on the system performance and load.</gold>",
 | 
					  "condense.eta": "<prefix><gold>Estimated time: No idea, times will drastically change based on the system performance and load.</gold>",
 | 
				
			||||||
  "condense.radius_measured": "<yellow> - Radius is measured in plot width.</yellow>",
 | 
					  "condense.radius_measured": "<yellow> - Radius is measured in plot width.</yellow>",
 | 
				
			||||||
  "database.starting_conversion": "<prefix><gold>Starting...</gold>",
 | 
					  "database.starting_conversion": "<prefix><gold>Starting...</gold>",
 | 
				
			||||||
@@ -381,9 +383,9 @@
 | 
				
			|||||||
  "info.plot_list_default": "<gold><plot></gold>",
 | 
					  "info.plot_list_default": "<gold><plot></gold>",
 | 
				
			||||||
  "info.plot_list_player_online": "<dark_aqua><prefix></dark_aqua><hover:show_text:'<dark_aqua>Online</dark_aqua>'><gold><player></gold></hover>",
 | 
					  "info.plot_list_player_online": "<dark_aqua><prefix></dark_aqua><hover:show_text:'<dark_aqua>Online</dark_aqua>'><gold><player></gold></hover>",
 | 
				
			||||||
  "info.plot_list_player_offline": "<dark_aqua><prefix></dark_aqua><hover:show_text:'<dark_gray>Offline</dark_gray>'><gold><player></gold></hover>",
 | 
					  "info.plot_list_player_offline": "<dark_aqua><prefix></dark_aqua><hover:show_text:'<dark_gray>Offline</dark_gray>'><gold><player></gold></hover>",
 | 
				
			||||||
  "info.plot_list_player_unknown": "<hover:show_text:'<red>The owner of this plot is unknown</red>'><white><info.unknown></white></hover>",
 | 
					  "info.plot_list_player_unknown": "<hover:show_text:'<red>The owner of this plot is unknown</red>'><white><unknown></white></hover>",
 | 
				
			||||||
  "info.plot_list_player_server": "<hover:show_text:'<red>The plot is owned by the server</red>'><white><info.server></white></hover>",
 | 
					  "info.plot_list_player_server": "<hover:show_text:'<red>The plot is owned by the server</red>'><white><server></white></hover>",
 | 
				
			||||||
  "info.plot_list_player_everyone": "<hover:show_text:'<blue>The plot is owned by everyone</blue>'><white><info.everyone></white></hover>",
 | 
					  "info.plot_list_player_everyone": "<hover:show_text:'<blue>The plot is owned by everyone</blue>'><white><everyone></white></hover>",
 | 
				
			||||||
  "info.area_info_format": "<header>\n<reset><gold>Name: </gold><gray><name></gray>\n<gold>Type: </gold><gray><type></gray>\n<gold>Terrain: </gold><gray><terrain></gray>\n<gold>Usage: </gold><gray><usage>%</gray>\n<gold>Claimed: </gold><gray><claimed></gray>\n<gold>Clusters: </gold><gray><clusters></gray>\n<gold>Region: </gold><gray><region></gray>\n<gold>Generator: </gold><gray><generator></gray>\n<footer>",
 | 
					  "info.area_info_format": "<header>\n<reset><gold>Name: </gold><gray><name></gray>\n<gold>Type: </gold><gray><type></gray>\n<gold>Terrain: </gold><gray><terrain></gray>\n<gold>Usage: </gold><gray><usage>%</gray>\n<gold>Claimed: </gold><gray><claimed></gray>\n<gold>Clusters: </gold><gray><clusters></gray>\n<gold>Region: </gold><gray><region></gray>\n<gold>Generator: </gold><gray><generator></gray>\n<footer>",
 | 
				
			||||||
  "info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>",
 | 
					  "info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>",
 | 
				
			||||||
  "info.area_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:'<command_info>'><hover:show_text:'<hover_info>'><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",
 | 
					  "info.area_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:'<command_info>'><hover:show_text:'<hover_info>'><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",
 | 
				
			||||||
@@ -589,6 +591,7 @@
 | 
				
			|||||||
  "flags.flag_description_place": "<gray>Define a list of materials players should be able to place in the plot.</gray>",
 | 
					  "flags.flag_description_place": "<gray>Define a list of materials players should be able to place in the plot.</gray>",
 | 
				
			||||||
  "flags.flag_description_player_interact": "<gray>Set to `true` to allow guests to interact with players in the plot.</gray>",
 | 
					  "flags.flag_description_player_interact": "<gray>Set to `true` to allow guests to interact with players in the plot.</gray>",
 | 
				
			||||||
  "flags.flag_description_price": "<gray>Set a price for a plot. Must be a positive decimal number.</gray>",
 | 
					  "flags.flag_description_price": "<gray>Set a price for a plot. Must be a positive decimal number.</gray>",
 | 
				
			||||||
 | 
					  "flags.flag_description_projectile_change_block": "<gray>Set to `true` to allow projectiles to change blocks (tnt, etc.) on the plot.</gray>",
 | 
				
			||||||
  "flags.flag_description_pve": "<gray>Set to `true` to enable PVE inside the plot.</gray>",
 | 
					  "flags.flag_description_pve": "<gray>Set to `true` to enable PVE inside the plot.</gray>",
 | 
				
			||||||
  "flags.flag_description_pvp": "<gray>Set to `true` to enable PVP inside the plot.</gray>",
 | 
					  "flags.flag_description_pvp": "<gray>Set to `true` to enable PVP inside the plot.</gray>",
 | 
				
			||||||
  "flags.flag_description_redstone": "<gray>Set to `false` to disable redstone in the plot.</gray>",
 | 
					  "flags.flag_description_redstone": "<gray>Set to `false` to disable redstone in the plot.</gray>",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,7 +22,7 @@ plugins {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
group = "com.intellectualsites.plotsquared"
 | 
					group = "com.intellectualsites.plotsquared"
 | 
				
			||||||
version = "7.2.1-SNAPSHOT"
 | 
					version = "7.3.4-SNAPSHOT"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if (!File("$rootDir/.git").exists()) {
 | 
					if (!File("$rootDir/.git").exists()) {
 | 
				
			||||||
    logger.lifecycle("""
 | 
					    logger.lifecycle("""
 | 
				
			||||||
@@ -79,8 +79,8 @@ subprojects {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    dependencies {
 | 
					    dependencies {
 | 
				
			||||||
        // Tests
 | 
					        // Tests
 | 
				
			||||||
        testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
 | 
					        testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
 | 
				
			||||||
        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.1")
 | 
					        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.2")
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    plugins.withId("java") {
 | 
					    plugins.withId("java") {
 | 
				
			||||||
@@ -225,7 +225,7 @@ tasks.getByName<Jar>("jar") {
 | 
				
			|||||||
    enabled = false
 | 
					    enabled = false
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1", "1.20.2")
 | 
					val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1", "1.20.4")
 | 
				
			||||||
tasks {
 | 
					tasks {
 | 
				
			||||||
    register("cacheLatestFaweArtifact") {
 | 
					    register("cacheLatestFaweArtifact") {
 | 
				
			||||||
        val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
 | 
					        val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,18 +2,18 @@
 | 
				
			|||||||
# Platform expectations
 | 
					# Platform expectations
 | 
				
			||||||
paper = "1.20.2-R0.1-SNAPSHOT"
 | 
					paper = "1.20.2-R0.1-SNAPSHOT"
 | 
				
			||||||
guice = "7.0.0"
 | 
					guice = "7.0.0"
 | 
				
			||||||
spotbugs = "4.8.2"
 | 
					spotbugs = "4.8.3"
 | 
				
			||||||
checkerqual = "3.40.0"
 | 
					checkerqual = "3.42.0"
 | 
				
			||||||
gson = "2.10"
 | 
					gson = "2.10"
 | 
				
			||||||
guava = "31.1-jre"
 | 
					guava = "31.1-jre"
 | 
				
			||||||
snakeyaml = "2.0"
 | 
					snakeyaml = "2.0"
 | 
				
			||||||
adventure = "4.14.0"
 | 
					adventure = "4.15.0"
 | 
				
			||||||
adventure-bukkit = "4.3.1"
 | 
					adventure-bukkit = "4.3.2"
 | 
				
			||||||
log4j = "2.19.0"
 | 
					log4j = "2.19.0"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Plugins
 | 
					# Plugins
 | 
				
			||||||
worldedit = "7.2.17"
 | 
					worldedit = "7.2.18"
 | 
				
			||||||
fawe = "2.8.2"
 | 
					fawe = "2.8.4"
 | 
				
			||||||
placeholderapi = "2.11.5"
 | 
					placeholderapi = "2.11.5"
 | 
				
			||||||
luckperms = "5.4"
 | 
					luckperms = "5.4"
 | 
				
			||||||
essentialsx = "2.20.1"
 | 
					essentialsx = "2.20.1"
 | 
				
			||||||
@@ -35,9 +35,9 @@ serverlib = "2.3.4"
 | 
				
			|||||||
# Gradle plugins
 | 
					# Gradle plugins
 | 
				
			||||||
shadow = "8.1.1"
 | 
					shadow = "8.1.1"
 | 
				
			||||||
grgit = "4.1.1"
 | 
					grgit = "4.1.1"
 | 
				
			||||||
spotless = "6.23.2"
 | 
					spotless = "6.25.0"
 | 
				
			||||||
nexus = "1.3.0"
 | 
					nexus = "1.3.0"
 | 
				
			||||||
runPaper = "2.2.2"
 | 
					runPaper = "2.2.3"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[libraries]
 | 
					[libraries]
 | 
				
			||||||
# Platform expectations
 | 
					# Platform expectations
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
distributionBase=GRADLE_USER_HOME
 | 
					distributionBase=GRADLE_USER_HOME
 | 
				
			||||||
distributionPath=wrapper/dists
 | 
					distributionPath=wrapper/dists
 | 
				
			||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 | 
					distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 | 
				
			||||||
networkTimeout=10000
 | 
					networkTimeout=10000
 | 
				
			||||||
validateDistributionUrl=true
 | 
					validateDistributionUrl=true
 | 
				
			||||||
zipStoreBase=GRADLE_USER_HOME
 | 
					zipStoreBase=GRADLE_USER_HOME
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										20
									
								
								gradlew.bat
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								gradlew.bat
									
									
									
									
										vendored
									
									
								
							@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 | 
				
			|||||||
%JAVA_EXE% -version >NUL 2>&1
 | 
					%JAVA_EXE% -version >NUL 2>&1
 | 
				
			||||||
if %ERRORLEVEL% equ 0 goto execute
 | 
					if %ERRORLEVEL% equ 0 goto execute
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo.
 | 
					echo. 1>&2
 | 
				
			||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 | 
					echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
 | 
				
			||||||
echo.
 | 
					echo. 1>&2
 | 
				
			||||||
echo Please set the JAVA_HOME variable in your environment to match the
 | 
					echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 | 
				
			||||||
echo location of your Java installation.
 | 
					echo location of your Java installation. 1>&2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
goto fail
 | 
					goto fail
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
if exist "%JAVA_EXE%" goto execute
 | 
					if exist "%JAVA_EXE%" goto execute
 | 
				
			||||||
 | 
					
 | 
				
			||||||
echo.
 | 
					echo. 1>&2
 | 
				
			||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
 | 
					echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
 | 
				
			||||||
echo.
 | 
					echo. 1>&2
 | 
				
			||||||
echo Please set the JAVA_HOME variable in your environment to match the
 | 
					echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 | 
				
			||||||
echo location of your Java installation.
 | 
					echo location of your Java installation. 1>&2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
goto fail
 | 
					goto fail
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user