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 #376 from jedk1/master

Browse source 
Fix help command
This commit is contained in:
OmniCypher 2016-01-10 14:17:21 -08:00
parent 3c893bbb8d de5c45d0e6
commit 091f381def
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/com/projectkorra/projectkorra/command/HelpCommand.java
View file

@ -32,7 +32,7 @@ public class HelpCommand extends PKCommand {
else if (args.size() == 0) {
List<String> strings = new ArrayList<String>();
for (PKCommand command : instances.values()) {
if (!command.getName().equalsIgnoreCase("help")) {
if (!command.getName().equalsIgnoreCase("help") && sender.hasPermission("bending.command." + command.getName())) {
strings.add(command.getProperUse());
}
}
@ -51,7 +51,7 @@ public class HelpCommand extends PKCommand {
if (isNumeric(arg)) {
List<String> strings = new ArrayList<String>();
for (PKCommand command : instances.values()) {
if (!command.getName().equalsIgnoreCase("help")) {
if (!command.getName().equalsIgnoreCase("help") && sender.hasPermission("bending.command." + command.getName())) {
strings.add(command.getProperUse());
}
}

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

@ -43,7 +43,7 @@ public class HealingWaters {
Entity entity = GeneralMethods.getTargetedEntity(player, range, new ArrayList<Entity>());
if (entity instanceof LivingEntity && inWater(entity) && player.isSneaking()) {
giveHPToEntity((LivingEntity) entity);
} else if ((player.isSneaking() && shift) || (player.isSneaking() && shift)){
} else if ((player.isSneaking() && shift) || !shift){
giveHP(player);
}
}