502647092/TabooLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 5.03 beta 23

Browse Source
This commit is contained in:
坏黑
2019-08-18 01:13:30 +08:00
parent a102bcaf7f
commit b6c154e914
8 changed files with 68 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/io/izzel/taboolib/common/plugin/InternalPluginBridge.java
View File

@@ -1,6 +1,5 @@
package io.izzel.taboolib.common.plugin;
import com.sk89q.worldguard.protection.managers.RegionManager;
import io.izzel.taboolib.module.lite.SimpleVersionControl;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
@@ -52,8 +51,6 @@ public abstract class InternalPluginBridge {
abstract public boolean permissionHas(Player player, String perm);
abstract public RegionManager worldguardRegionManager(World world);
abstract public Collection<String> worldguardGetRegions(World world);
abstract public List<String> worldguardGetRegion(World world, Location location);

27
src/main/scala/io/izzel/taboolib/common/plugin/bridge/BridgeImpl.java
View File

@@ -128,20 +128,6 @@ public class BridgeImpl extends InternalPluginBridge {
return worldguardRegionManager(world).getRegions().values().stream().filter(r -> r.contains(location.getBlockX(), location.getBlockY(), location.getBlockZ())).map(ProtectedRegion::getId).collect(Collectors.toList());
}
@Override
public RegionManager worldguardRegionManager(World world) {
if (WorldGuardPlugin.inst().getDescription().getVersion().startsWith("7")) {
return WorldGuard.getInstance().getPlatform().getRegionContainer().get(BukkitAdapter.adapt(world));
} else {
try {
return (RegionManager) getRegionManager.invoke(WorldGuardPlugin.inst(), world);
} catch (Throwable t) {
t.printStackTrace();
}
return null;
}
}
@Override
public boolean economyHooked() {
return economy != null;
@@ -237,4 +223,17 @@ public class BridgeImpl extends InternalPluginBridge {
public Class getClass(String name) throws ClassNotFoundException {
return Class.forName(name);
}
private RegionManager worldguardRegionManager(World world) {
if (WorldGuardPlugin.inst().getDescription().getVersion().startsWith("7")) {
return WorldGuard.getInstance().getPlatform().getRegionContainer().get(BukkitAdapter.adapt(world));
} else {
try {
return (RegionManager) getRegionManager.invoke(WorldGuardPlugin.inst(), world);
} catch (Throwable t) {
t.printStackTrace();
}
return null;
}
}
}