Upstream
/
ActionHealth
mirror of https://github.com/zeshan321/ActionHealth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Temporary removing worldguard for 1.13

This commit is contained in:
Zeshan Aslam 2018-08-20 20:36:15 -04:00
parent e680d4ab50
commit bfc523a6a0
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil$1.class
View File

Binary file not shown.

BIN
out/production/ActionHealth/com/zeshanaslam/actionhealth/HealthUtil.class
View File

Binary file not shown.

BIN
out/production/ActionHealth/com/zeshanaslam/actionhealth/LookThread.class
View File

Binary file not shown.

2
plugin.yml
View File

@ -1,6 +1,6 @@
name: ActionHealth
main: com.zeshanaslam.actionhealth.Main
version: 3.2.4
version: 3.2.5
softdepend: [PlaceholderAPI, MVdWPlaceholderAPI]
commands:
Actionhealth:

12
src/com/zeshanaslam/actionhealth/HealthUtil.java
View File

@ -3,6 +3,7 @@ package com.zeshanaslam.actionhealth;
import be.maximvdw.placeholderapi.PlaceholderAPI;
import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import com.sk89q.worldguard.protection.regions.RegionContainer;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
@ -225,10 +226,13 @@ public class HealthUtil {
return false;
}
ApplicableRegionSet applicableRegions = plugin.worldGuardPlugin.getRegionManager(location.getWorld()).getApplicableRegions(location);
for (ProtectedRegion region : applicableRegions) {
if (plugin.settingsManager.regions.contains(region.getId())) {
return true;
// Temp until WG 7 API is available for 1.13
if (!plugin.settingsManager.mcVersion.equals("v1_13_R1")) {
ApplicableRegionSet applicableRegions = plugin.worldGuardPlugin.getRegionManager(location.getWorld()).getApplicableRegions(location);
for (ProtectedRegion region : applicableRegions) {
if (plugin.settingsManager.regions.contains(region.getId())) {
return true;
}
}
}