TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 19:50:37 +00:00
Code Issues Projects Releases Wiki Activity

Forgot to delete comments like commit bad3c18

Browse source
This commit is contained in:
jack lin 2014-07-30 00:09:46 +12:00
parent 6fd33e9d4d
commit 6517230473
1 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -145,8 +145,6 @@ public class Methods {
} else { } else {
Information info = new Information(); Information info = new Information();
info.setBlock(block); info.setBlock(block);
// info.setType(block.getType());
// info.setData(block.getData());
info.setState(block.getState()); info.setState(block.getState());
info.setTime(System.currentTimeMillis()); info.setTime(System.currentTimeMillis());
block.setType(Material.AIR); block.setType(Material.AIR);
@ -1068,8 +1066,7 @@ public class Methods {
return false; return false;
} }
public static boolean isRegionProtectedFromBuild(Player player, public static boolean isRegionProtectedFromBuild(Player player, String ability, Location loc) {
String ability, Location loc) {
boolean allowharmless = plugin.getConfig().getBoolean("Properties.RegionProtection.AllowHarmlessAbilities"); boolean allowharmless = plugin.getConfig().getBoolean("Properties.RegionProtection.AllowHarmlessAbilities");
boolean respectWorldGuard = plugin.getConfig().getBoolean("Properties.RegionProtection.RespectWorldGuard"); boolean respectWorldGuard = plugin.getConfig().getBoolean("Properties.RegionProtection.RespectWorldGuard");
@ -1154,23 +1151,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) {
@ -1343,9 +1328,6 @@ public class Methods {
if (EarthPassive.isPassiveSand(block)) { if (EarthPassive.isPassiveSand(block)) {
EarthPassive.revertSand(block); EarthPassive.revertSand(block);
} }
// if (block.getType() == Material.SAND) {
// block.setType(Material.SANDSTONE);
// }
if (affectedblock == null) if (affectedblock == null)
return false; return false;