EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge v5 into v6

Browse Source
This commit is contained in:
N0tMyFaultOG
2020-08-24 14:33:53 +02:00
parent 31ea7297c2 c42d5390a4
commit 02bd83bd90
17 changed files with 36 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Core/build.gradle
View File

@ -12,6 +12,7 @@ dependencies {
force = true
}
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.3.72")
implementation("org.jetbrains:annotations:20.0.0")
implementation("org.khelekore:prtree:1.7.0-SNAPSHOT")
// Adventure related stuff
implementation('net.kyori:adventure-api:4.0.0-SNAPSHOT')

12
Core/pom.xml
View File

@ -92,6 +92,12 @@
<version>1.3.72</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>20.0.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.khelekore</groupId>
<artifactId>prtree</artifactId>
@ -116,6 +122,12 @@
<version>2.8.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.intellectualsites</groupId>
<artifactId>Pipeline</artifactId>
<version>1.4.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>

2
Core/src/main/java/com/plotsquared/core/command/HomeCommand.java
View File

@ -92,7 +92,7 @@ public class HomeCommand extends Command {
@Nonnull private PlotQuery query(@Nonnull final PlotPlayer<?> player) {
// everything plots need to have in common here
return PlotQuery.newQuery().ownedBy(player);
return PlotQuery.newQuery().thatPasses(plot -> plot.isOwner(player.getUUID()));
}
@Override public CompletableFuture<Boolean> execute(PlotPlayer<?> player, String[] args,

2
Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java
View File

@ -142,7 +142,7 @@ public final class GlobalFlagContainer extends FlagContainer {
this.addFlag(AnimalAttackFlag.ANIMAL_ATTACK_FALSE);
this.addFlag(AnimalInteractFlag.ANIMAL_INTERACT_FALSE);
this.addFlag(BlockBurnFlag.BLOCK_BURN_FALSE);
this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_TRUE);
this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_FALSE);
this.addFlag(DeviceInteractFlag.DEVICE_INTERACT_FALSE);
this.addFlag(DisablePhysicsFlag.DISABLE_PHYSICS_FALSE);
this.addFlag(DropProtectionFlag.DROP_PROTECTION_FALSE);