TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-09-11 04:39:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11 from Anonymous1432/master

Browse source 
Bending now supports the latest factions & mcore
This commit is contained in:
MistPhizzle 2014-07-30 09:52:27 -04:00
parent 7b9243afb2 9f02959cf0
commit 85c9d79996
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/com/projectkorra/ProjectKorra/Methods.java
View file

@ -48,7 +48,7 @@ import org.bukkit.plugin.PluginManager;
import org.bukkit.util.Vector;
import com.massivecraft.factions.listeners.FactionsListenerMain;
import com.massivecraft.mcore.ps.PS;
import com.massivecraft.massivecore.ps.PS;
import com.palmergames.bukkit.towny.Towny;
import com.palmergames.bukkit.towny.TownyMessaging;
import com.palmergames.bukkit.towny.TownySettings;
@ -1090,7 +1090,7 @@ public class Methods {
Plugin fcp = pm.getPlugin("Factions");
Plugin twnp = pm.getPlugin("Towny");
Plugin gpp = pm.getPlugin("GriefPrevention");
Plugin mcore = pm.getPlugin("mcore");
Plugin massivecore = pm.getPlugin("MassiveCore");
for (Location location : new Location[] { loc, player.getLocation() }) {
@ -1150,7 +1150,7 @@ public class Methods {
return true;
}
if (fcp != null && mcore != null && respectFactions) {
if (fcp != null && massivecore != null && respectFactions) {
if (!FactionsListenerMain.canPlayerBuildAt(player, PS.valueOf(loc.getBlock()), false)) {
return true;
} else {