Upstream/RandomTeleport
1
0
Fork 0
mirror of https://github.com/Phoenix616/RandomTeleport.git synced 2024-11-29 14:15:25 +01:00
Code Issues Projects Releases Wiki Activity

Added ClanControl support

Browse Source
This commit is contained in:
Max Lee 2015-06-30 18:21:09 +02:00
parent 8999f30d2f
commit 8417304ea7
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RandomTeleport v1.0/pom.xml
View File

@ -28,6 +28,11 @@
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.8-R0.1-SNAPSHOT</version> <version>1.8-R0.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>de.themoep</groupId>
<artifactId>ClanControl</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>

43
RandomTeleport v1.0/src/main/java/de/themoep/bukkit/plugin/RandomTeleport/RandomTeleport.java
View File

@ -1,6 +1,9 @@
package de.themoep.bukkit.plugin.RandomTeleport; package de.themoep.bukkit.plugin.RandomTeleport;
import de.themoep.bukkit.plugin.RandomTeleport.Listeners.SignListener; import de.themoep.bukkit.plugin.RandomTeleport.Listeners.SignListener;
import de.themoep.clancontrol.ClanControl;
import de.themoep.clancontrol.Region;
import de.themoep.clancontrol.RegionStatus;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.World.Environment; import org.bukkit.World.Environment;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
@ -40,6 +43,7 @@ public class RandomTeleport extends JavaPlugin implements CommandExecutor {
public int factionsApiVersion = 0; public int factionsApiVersion = 0;
public boolean worldguard = false; public boolean worldguard = false;
public boolean clancontrol = false;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ -61,6 +65,11 @@ public class RandomTeleport extends JavaPlugin implements CommandExecutor {
worldguard = true; worldguard = true;
} }
if(Bukkit.getPluginManager().getPlugin("ClanControl") != null){
getLogger().log(Level.INFO, "Detected ClanControl.");
clancontrol = true;
}
if(Bukkit.getPluginManager().getPlugin("Factions") != null){ if(Bukkit.getPluginManager().getPlugin("Factions") != null){
String version = Bukkit.getPluginManager().getPlugin("Factions").getDescription().getVersion(); String version = Bukkit.getPluginManager().getPlugin("Factions").getDescription().getVersion();
if(version.startsWith("2.7") || version.startsWith("2.8") || version.startsWith("2.9") || version.startsWith("2.10")) { if(version.startsWith("2.7") || version.startsWith("2.8") || version.startsWith("2.9") || version.startsWith("2.10")) {
@ -574,22 +583,34 @@ public class RandomTeleport extends JavaPlugin implements CommandExecutor {
private boolean checkforRegion(Player player, Location location, Boolean forceRegions) { private boolean checkforRegion(Player player, Location location, Boolean forceRegions) {
if(!forceRegions) { if(!forceRegions) {
Block block = location.getWorld().getBlockAt(location); Block block = location.getWorld().getBlockAt(location);
if (worldguard && !com.sk89q.worldguard.bukkit.WGBukkit.getPlugin().canBuild(player, block)) { if(worldguard && !com.sk89q.worldguard.bukkit.WGBukkit.getPlugin().canBuild(player, block)) {
return false; return false;
} }
if (factionsApiVersion == 27) { if(clancontrol) {
com.massivecraft.factions.entity.Faction faction = com.massivecraft.factions.entity.BoardColl.get().getFactionAt(com.massivecraft.massivecore.ps.PS.valueOf(block)); boolean chunkOccupied = ClanControl.getInstance().getRegionManager().getChunk(location) != null;
if (faction != com.massivecraft.factions.entity.FactionColl.get().getNone()) return false; Region region = ClanControl.getInstance().getRegionManager().getRegion(location);
} if(chunkOccupied || (region != null && region.getStatus() != RegionStatus.FREE)) {
if (factionsApiVersion == 26) {
com.massivecraft.factions.entity.Faction faction = com.massivecraft.factions.entity.BoardColls.get().getFactionAt(com.massivecraft.massivecore.ps.PS.valueOf(block));
if (faction != com.massivecraft.factions.entity.FactionColls.get().getForWorld(location.getWorld().getName()).getNone())
return false; return false;
}
} }
if (factionsApiVersion == 16) { if(factionsApiVersion == 27) {
com.massivecraft.factions.entity.Faction faction = com.massivecraft.factions.entity.BoardColl.get().getFactionAt(com.massivecraft.massivecore.ps.PS.valueOf(block));
if(faction != com.massivecraft.factions.entity.FactionColl.get().getNone()) {
return false;
}
}
if(factionsApiVersion == 26) {
com.massivecraft.factions.entity.Faction faction = com.massivecraft.factions.entity.BoardColls.get().getFactionAt(com.massivecraft.massivecore.ps.PS.valueOf(block));
if(faction != com.massivecraft.factions.entity.FactionColls.get().getForWorld(location.getWorld().getName()).getNone()) {
return false;
}
}
if(factionsApiVersion == 16) {
com.massivecraft.factions.Faction faction = com.massivecraft.factions.Board.getInstance().getFactionAt(new com.massivecraft.factions.FLocation(location)); com.massivecraft.factions.Faction faction = com.massivecraft.factions.Board.getInstance().getFactionAt(new com.massivecraft.factions.FLocation(location));
if (faction != com.massivecraft.factions.Factions.getInstance().getNone()) return false; if(faction != com.massivecraft.factions.Factions.getInstance().getNone()) {
return false;
}
} }
} }
return true; return true;