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

Merge pull request #448 from StrangeOne101/master

Browse source 
Add Forgotten Changes
This commit is contained in:
OmniCypher 2016-03-16 18:41:38 -07:00
commit efa0d4a9bd
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/com/projectkorra/projectkorra/command/AddCommand.java
View file

@ -98,6 +98,13 @@ public class AddCommand extends PKCommand {
return; return;
} }
bPlayer.addElement(e); bPlayer.addElement(e);
for (SubElement sub : Element.getAllSubElements()) {
if (sub.getParentElement() == e && bPlayer.hasSubElementPermission(sub)) {
bPlayer.addSubElement(sub);
}
}
ChatColor color = e.getColor(); ChatColor color = e.getColor();
if (!(sender instanceof Player) || !((Player) sender).equals(target)) { if (!(sender instanceof Player) || !((Player) sender).equals(target)) {
@ -106,6 +113,7 @@ public class AddCommand extends PKCommand {
target.sendMessage(color + added.replace("{element}", e.getName() + e.getType().getBender())); target.sendMessage(color + added.replace("{element}", e.getName() + e.getType().getBender()));
} }
GeneralMethods.saveElements(bPlayer); GeneralMethods.saveElements(bPlayer);
GeneralMethods.saveSubElements(bPlayer);
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, target, e, Result.ADD)); Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, target, e, Result.ADD));
return; return;
} else if (Arrays.asList(Element.getAllSubElements()).contains(e)) { } else if (Arrays.asList(Element.getAllSubElements()).contains(e)) {

1
src/com/projectkorra/projectkorra/command/ChooseCommand.java
View file

@ -138,6 +138,7 @@ public class ChooseCommand extends PKCommand {
target.sendMessage(color + chosen.replace("{element}", element.getName() + element.getType().getBender())); target.sendMessage(color + chosen.replace("{element}", element.getName() + element.getType().getBender()));
} }
GeneralMethods.saveElements(bPlayer); GeneralMethods.saveElements(bPlayer);
GeneralMethods.saveSubElements(bPlayer);
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, target, element, Result.CHOOSE)); Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, target, element, Result.CHOOSE));
} }