TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-10-03 15:34:49 +00:00
Code Issues Projects Releases Wiki Activity

Hot fix (#698)

Browse source
This commit is contained in:
Sobki 2017-01-17 13:56:21 +10:00 committed by Christopher Martin
parent 1c282ca550
commit 7e4ef6d5a2
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/com/projectkorra/projectkorra/BendingPlayer.java
View file

@ -247,12 +247,21 @@ public class BendingPlayer {
return false; return false;
} else if (!player.hasPermission("bending." + element.getName() + ".passive")) { } else if (!player.hasPermission("bending." + element.getName() + ".passive")) {
return false; return false;
} else if (!isToggled() || !hasElement(element) || !isElementToggled(element)) { } else if (!hasElement(element)) {
return false; return false;
} else if (isChiBlocked() || isParalyzed() || isBloodbent()) { } else if (isChiBlocked() || isParalyzed() || isBloodbent()) {
return false; return false;
} else if (disabledWorlds != null && disabledWorlds.contains(player.getWorld().getName())) { } else if (disabledWorlds != null && disabledWorlds.contains(player.getWorld().getName())) {
return false; return false;
}
return true;
}
public boolean canUsePassive(Element element) {
if (!isToggled() || !isElementToggled(element)) {
return false;
} else if (isChiBlocked() || isParalyzed() || isBloodbent()) {
return false;
} else if (GeneralMethods.isRegionProtectedFromBuild(player, player.getLocation())) { } else if (GeneralMethods.isRegionProtectedFromBuild(player, player.getLocation())) {
return false; return false;
} }

2
src/com/projectkorra/projectkorra/PKListener.java
View file

@ -1030,7 +1030,7 @@ public class PKListener implements Listener {
Bukkit.getScheduler().runTaskLater(ProjectKorra.plugin, new Runnable() { Bukkit.getScheduler().runTaskLater(ProjectKorra.plugin, new Runnable() {
public void run() { public void run() {
player.sendMessage(ChatColor.GREEN + "This server is running ProjectKorra version " + ProjectKorra.plugin.getDescription().getVersion() + " for bending! Find out more at http://www.projectkorra.com!"); player.sendMessage(ChatColor.GOLD + "This server is running ProjectKorra version " + ProjectKorra.plugin.getDescription().getVersion() + " for bending! Find out more at http://www.projectkorra.com!");
} }
}, 20 * 5); }, 20 * 5);
} }

4
src/com/projectkorra/projectkorra/ability/CoreAbility.java
View file

@ -214,9 +214,11 @@ public abstract class CoreAbility implements Ability {
if (bPlayer == null || !abil.getPlayer().isOnline()) { if (bPlayer == null || !abil.getPlayer().isOnline()) {
abil.remove(); abil.remove();
return; return;
} else if (!bPlayer.canBendPassive(abil.getElement())) { } else if (!bPlayer.canBendPassive(abil.getElement())) { // Check for if the passive should be removed
abil.remove(); abil.remove();
return; return;
} else if (!bPlayer.canUsePassive(abil.getElement())) { // Check for if the passive should be prevented from happening, but not remove it
return;
} }
} }
abil.progress(); abil.progress();

1
src/com/projectkorra/projectkorra/waterbending/WaterSpoutWave.java
View file

@ -6,7 +6,6 @@ import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;