TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-10-05 16:32:53 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #472 from Simplicitee/master

Browse source 
Fix Fixes
This commit is contained in:
OmniCypher 2016-04-06 16:36:25 -07:00
parent a5fb773613 1afe4a65e1
commit c4ca9301bc
2 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -496,16 +496,8 @@ public class BendingPlayer {
} else if (!(element instanceof SubElement)) {
return this.elements.contains(element);
} else {
Element parentElement = ((SubElement) element).getParentElement();
String prefix = "bending." + parentElement.getName() + ".";
// Some permissions are bending.water.name and some are bending.water.namebending
if (player.hasPermission(prefix + element.getName())
|| player.hasPermission(prefix + element.getName() + "bending")) {
return true;
}
return hasSubElement((SubElement)element);
}
return false;
}
public boolean hasSubElement(SubElement sub) {

14
src/com/projectkorra/projectkorra/command/RemoveCommand.java
View file

@ -2,11 +2,12 @@ package com.projectkorra.projectkorra.command;
import com.projectkorra.projectkorra.BendingPlayer;
import com.projectkorra.projectkorra.Element;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.Element.SubElement;
import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.configuration.ConfigManager;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent.Result;
import com.projectkorra.projectkorra.event.PlayerChangeSubElementEvent;
import com.projectkorra.rpg.RPGMethods;
import org.bukkit.Bukkit;
@ -57,7 +58,7 @@ public class RemoveCommand extends PKCommand {
GeneralMethods.saveSubElements(senderBPlayer);
GeneralMethods.removeUnusableAbilities(sender.getName());
sender.sendMessage(e.getColor() + this.succesfullyRemovedElementSelf.replace("{element}" , e.getName() + e.getType().getBending()).replace("{sender}", ChatColor.DARK_AQUA + sender.getName() + e.getColor()));
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, player, e, Result.REMOVE));
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeSubElementEvent(sender, player, (SubElement) e, com.projectkorra.projectkorra.event.PlayerChangeSubElementEvent.Result.REMOVE));
} else sender.sendMessage(ChatColor.RED + invalidElement);
return;
}
@ -73,15 +74,6 @@ public class RemoveCommand extends PKCommand {
sender.sendMessage(ChatColor.RED + wrongElementSelf);
return;
}
} else if (SubElement.fromString(args.get(0)) != null) {
SubElement sub = (SubElement) SubElement.fromString(args.get(0));
if (senderBPlayer.hasSubElement(sub)) {
senderBPlayer.getSubElements().remove(sub);
GeneralMethods.saveSubElements(senderBPlayer);
GeneralMethods.removeUnusableAbilities(sender.getName());
sender.sendMessage(sub.getColor() + this.succesfullyRemovedElementSelf.replace("{element}" , sub.getName() + sub.getType().getBending()).replace("{sender}", ChatColor.DARK_AQUA + sender.getName() + sub.getColor()));
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, player, e, Result.REMOVE));
}
} else {
sender.sendMessage(ChatColor.RED + invalidElement);
return;