TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-11-01 01:42:18 +00:00
Code Issues Projects Releases Wiki Activity

Update dependencies

Browse source
This commit is contained in:
Simplicitee 2018-11-04 17:12:24 -05:00
parent 801cd6e50f
commit 2d9b3b7fa2
9 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
lib/GriefPrevention 10.5.3.jar
View file

Binary file not shown.

BIN
lib/GriefPrevention.jar Normal file
View file

Binary file not shown.

BIN
lib/LWC.jar
View file

Binary file not shown.

BIN
lib/Modern-LWC-2.1.1.jar Normal file
View file

Binary file not shown.

BIN
lib/Residence4.0.0.4.jar
View file

Binary file not shown.

BIN
lib/Residence4.8.2.0.jar Normal file
View file

Binary file not shown.

BIN
lib/Towny.jar
View file

Binary file not shown.

6
pom.xml
View file

@ -38,7 +38,7 @@
<artifactId>GriefPrevention</artifactId>
<version>LATEST</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/GriefPrevention 10.5.3.jar</systemPath>
<systemPath>${project.basedir}/lib/GriefPrevention.jar</systemPath>
</dependency>
<!-- LWC -->
<dependency>
@ -46,7 +46,7 @@
<artifactId>lwc</artifactId>
<version>LATEST</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/LWC.jar</systemPath>
<systemPath>${project.basedir}/lib/Modern-LWC-2.1.1.jar</systemPath>
</dependency>
<!-- MassiveCore -->
<dependency>
@ -78,7 +78,7 @@
<artifactId>residence</artifactId>
<version>LATEST</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/Residence4.0.0.4.jar</systemPath>
<systemPath>${project.basedir}/lib/Residence4.8.2.0.jar</systemPath>
</dependency>
<!-- Towny -->
<dependency>

13
src/com/projectkorra/projectkorra/GeneralMethods.java
View file

@ -66,6 +66,7 @@ import org.kingdoms.constants.player.KingdomPlayer;
import org.kingdoms.manager.game.GameManagement;
import com.bekvon.bukkit.residence.Residence;
import com.bekvon.bukkit.residence.api.ResidenceInterface;
import com.bekvon.bukkit.residence.protection.ClaimedResidence;
import com.bekvon.bukkit.residence.protection.ResidencePermissions;
import com.google.common.reflect.ClassPath;
@ -1500,8 +1501,7 @@ public class GeneralMethods {
try {
final TownyWorld tWorld = TownyUniverse.getDataSource().getWorld(world.getName());
worldCoord = new WorldCoord(tWorld.getName(), Coord.parseCoord(location));
final boolean bBuild = PlayerCacheUtil.getCachePermission(player, location, 3, (byte) 0, TownyPermission.ActionType.BUILD);
final boolean bBuild = PlayerCacheUtil.getCachePermission(player, location, Material.DIRT, TownyPermission.ActionType.BUILD);
if (!bBuild) {
final PlayerCache cache = twn.getCache(player);
@ -1546,10 +1546,11 @@ public class GeneralMethods {
}
if (residence != null && respectResidence) {
final ClaimedResidence res = Residence.getResidenceManager().getByLoc(loc);
if (res != null) {
final ResidencePermissions perms = res.getPermissions();
if (perms.playerHas(player.getName(), ConfigManager.defaultConfig.get().getString("Properities.RegionProtection.Residence.Flag"), true)) {
final ResidenceInterface res = Residence.getInstance().getResidenceManagerAPI();
final ClaimedResidence claim = res.getByLoc(location);
if (claim != null) {
final ResidencePermissions perms = claim.getPermissions();
if (!perms.hasApplicableFlag(player.getName(), ConfigManager.getConfig().getString("Properties.RegionProtection.Residence.Flag"))) {
return true;
}
}