diff --git a/dough-protection/pom.xml b/dough-protection/pom.xml index 100c547d..fa2e72ee 100644 --- a/dough-protection/pom.xml +++ b/dough-protection/pom.xml @@ -13,15 +13,24 @@ dough-protection jar + + 7.3.6 + + + - - sonatype-oss-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - jitpack.io https://jitpack.io/ + + papermc + https://repo.papermc.io/repository/maven-public/ + + + sonatype-oss-snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + coreprotect-repo https://maven.playpro.com/ @@ -164,9 +173,9 @@ - com.plotsquared - PlotSquared-Core - 6.11.1 + com.intellectualsites.plotsquared + plotsquared-core + ${plotsquared.version} provided @@ -175,6 +184,18 @@ + + com.intellectualsites.plotsquared + plotsquared-bukkit + ${plotsquared.version} + provided + + + plotsquared-core + * + + + diff --git a/dough-protection/src/main/java/io/github/bakedlibs/dough/protection/modules/PlotSquaredProtectionModule.java b/dough-protection/src/main/java/io/github/bakedlibs/dough/protection/modules/PlotSquaredProtectionModule.java index 466c0263..35b3aa01 100644 --- a/dough-protection/src/main/java/io/github/bakedlibs/dough/protection/modules/PlotSquaredProtectionModule.java +++ b/dough-protection/src/main/java/io/github/bakedlibs/dough/protection/modules/PlotSquaredProtectionModule.java @@ -5,13 +5,14 @@ import org.bukkit.OfflinePlayer; import org.bukkit.block.Block; +import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.core.location.Location; import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; -import com.plotsquared.core.util.Permissions; import io.github.bakedlibs.dough.protection.Interaction; import io.github.bakedlibs.dough.protection.ProtectionModule; @@ -53,12 +54,12 @@ private boolean check(OfflinePlayer p, Interaction action) { switch (action) { case INTERACT_BLOCK: - return Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_INTERACT_UNOWNED); + return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED); case ATTACK_PLAYER: - return Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_PVP); + return player.hasPermission(Permission.PERMISSION_ADMIN_PVP); case PLACE_BLOCK: default: - return Permissions.hasPermission(player, Permission.PERMISSION_ADMIN_BUILD_UNOWNED); + return player.hasPermission(Permission.PERMISSION_ADMIN_BUILD_UNOWNED); } } }