TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-12 03:59:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #284 from OmniCypher-/master

Browse source 
Fixes
This commit is contained in:
OmniCypher 2015-11-07 16:18:49 -08:00
commit 74e4f1bcb6
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -203,7 +203,9 @@ public class BendingPlayer {
}
public boolean isElementToggled(Element e) {
return this.toggledElements.get(e);
if(e != null)
return this.toggledElements.get(e);
return true;
}
/**

7
src/com/projectkorra/projectkorra/command/BindCommand.java
View file

@ -28,10 +28,6 @@ public class BindCommand extends PKCommand {
return;
}
if (GeneralMethods.getBendingPlayer(sender.getName()).isElementToggled(GeneralMethods.getAbilityElement(args.get(0))) == false) {
sender.sendMessage(ChatColor.RED + "You have that ability's element toggled off currently.");
}
String ability = GeneralMethods.getAbility(args.get(0));
// bending bind [Ability]
if (args.size() == 1) {
@ -53,7 +49,10 @@ public class BindCommand extends PKCommand {
if (!GeneralMethods.canBind(((Player) sender).getName(), ability)) {
sender.sendMessage(ChatColor.RED + "You don't have permission to bend this element.");
return;
} else if (!GeneralMethods.getBendingPlayer(sender.getName()).isElementToggled(GeneralMethods.getAbilityElement(ability))) {
sender.sendMessage(ChatColor.RED + "You have that ability's element toggled off currently.");
}
GeneralMethods.bindAbility((Player) sender, GeneralMethods.getAbility(ability), slot);
}
}

6
src/com/projectkorra/projectkorra/command/DebugCommand.java
View file

@ -38,10 +38,10 @@ public class DebugCommand extends PKCommand {
*/
@Override
public boolean hasPermission(CommandSender sender) {
if (sender.hasPermission("bending.admin." + getName())) {
if (!sender.hasPermission("bending.admin." + getName())) {
sender.sendMessage(ChatColor.RED + "You don't have permission to use this command.");
return true;
return false;
}
return false;
return true;
}
}

2
src/com/projectkorra/projectkorra/waterbending/WaterWave.java
View file

@ -82,7 +82,7 @@ public class WaterWave {
public void progress() {
progressCounter++;
if (player.isDead() || !player.isOnline() || !origin.getWorld().equals(player.getWorld())) {
if (player.isDead() || !player.isOnline()) {
remove();
return;
}