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

Merge pull request #8 from Anonymous1432/master

Browse source 
Patched bending in any faction land
This commit is contained in:
MistPhizzle 2014-07-28 11:32:25 -04:00
commit 5d6ca3938b
2 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.classpath
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/LocalServer/BukkitForPlugins.jar"/> <classpathentry kind="lib" path="C:/Users/Mommie/Desktop/Plugin Dev Testing/resources/bukkit.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/TagAPI.jar"/> <classpathentry kind="lib" path="C:/Users/Mommie/Desktop/Plugin Dev Testing/resources/TagAPI.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/Factions.jar"/> <classpathentry kind="lib" path="C:/Users/Mommie/Desktop/Plugin Dev Testing/resources/Factions.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/GriefPrevention.jar"/> <classpathentry kind="lib" path="C:/Users/Mommie/Desktop/Plugin Dev Testing/resources/GriefPrevention.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/mcore.jar"/> <classpathentry kind="lib" path="C:/Users/Mommie/Desktop/Plugin Dev Testing/resources/mcore.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/PreciousStones.jar"/> <classpathentry kind="lib" path="C:/Users/Mommie/Desktop/Plugin Dev Testing/resources/PreciousStones.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/Towny.jar"/> <classpathentry kind="lib" path="C:/Users/Mommie/Desktop/Plugin Dev Testing/resources/Towny.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/WorldEdit.jar"/> <classpathentry kind="lib" path="C:/Users/Mommie/Desktop/Plugin Dev Testing/resources/WorldEdit.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/WorldGuard.jar"/> <classpathentry kind="lib" path="C:/Users/Mommie/Desktop/Plugin Dev Testing/resources/WorldGuard.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

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

@ -1578,23 +1578,11 @@ public class Methods {
} }
if (fcp != null && mcore != null && respectFactions) { if (fcp != null && mcore != null && respectFactions) {
if (ignite.contains(ability)) { if (!FactionsListenerMain.canPlayerBuildAt(player, PS.valueOf(loc.getBlock()), false)) {
}
if (explode.contains(ability)) {
}
if (!FactionsListenerMain.canPlayerBuildAt(player,
PS.valueOf(loc.getBlock()), false)) {
return true; return true;
}else{
return false;
} }
// if (!FactionsBlockListener.playerCanBuildDestroyBlock(player,
// location, "build", true)) {
// return true;
// }
} }
if (twnp != null && respectTowny) { if (twnp != null && respectTowny) {