Updated to Factions/Massivecore 2.7.1

This commit is contained in:
Max Lee 2014-11-23 20:08:40 +01:00
parent 48870fa706
commit aa2a8bac6e

View File

@ -1,9 +1,9 @@
package de.themoep.bukkit.plugin.RandomTeleport; package de.themoep.bukkit.plugin.RandomTeleport;
import com.massivecraft.factions.entity.BoardColls; import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.Faction;
import com.massivecraft.factions.entity.FactionColls; import com.massivecraft.factions.entity.FactionColl;
import com.massivecraft.mcore.ps.PS; import com.massivecraft.massivecore.ps.PS;
import com.sk89q.worldguard.bukkit.WGBukkit; import com.sk89q.worldguard.bukkit.WGBukkit;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -455,9 +455,8 @@ public class RandomTeleport extends JavaPlugin implements CommandExecutor {
return false; return false;
} }
if(Bukkit.getPluginManager().getPlugin("Factions") != null){ if(Bukkit.getPluginManager().getPlugin("Factions") != null){
Faction wilderness = FactionColls.get().getForWorld(location.getWorld().getName()).getNone(); Faction faction = BoardColl.get().getFactionAt(PS.valueOf(highest));
Faction faction = BoardColls.get().getFactionAt(PS.valueOf(highest)); if(faction != FactionColl.get().getNone()) return false;
if(faction != wilderness) return false;
} }
return true; return true;
} }