TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-11-04 11:15:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix NPE with Custom Elements

Browse source
This commit is contained in:
jedk1 2016-02-25 00:15:52 +00:00
parent 042866ec62
commit 78a341e636
3 changed files with 29 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/com/projectkorra/projectkorra/GeneralMethods.java
View file

@ -302,29 +302,31 @@ public class GeneralMethods {
String permaremoved = rs2.getString("permaremoved"); String permaremoved = rs2.getString("permaremoved");
boolean p = false; boolean p = false;
final ArrayList<Element> elements = new ArrayList<Element>(); final ArrayList<Element> elements = new ArrayList<Element>();
boolean hasAddon = element.contains(";"); if (element != null) {
String[] split = element.split(";"); boolean hasAddon = element.contains(";");
if (split[0] != null) { // Player has an element. String[] split = element.split(";");
if (split[0].contains("a")) { if (split[0] != null) { // Player has an element.
elements.add(Element.AIR); if (split[0].contains("a")) {
} elements.add(Element.AIR);
if (split[0].contains("w")) { }
elements.add(Element.WATER); if (split[0].contains("w")) {
} elements.add(Element.WATER);
if (split[0].contains("e")) { }
elements.add(Element.EARTH); if (split[0].contains("e")) {
} elements.add(Element.EARTH);
if (split[0].contains("f")) { }
elements.add(Element.FIRE); if (split[0].contains("f")) {
} elements.add(Element.FIRE);
if (split[0].contains("c")) { }
elements.add(Element.CHI); if (split[0].contains("c")) {
} elements.add(Element.CHI);
} }
if (hasAddon) { if (hasAddon) {
for (String addon : split[split.length - 1].split(",")) { for (String addon : split[split.length - 1].split(",")) {
if (Element.getElement(addon) != null) { if (Element.getElement(addon) != null) {
elements.add(Element.getElement(addon)); elements.add(Element.getElement(addon));
}
}
} }
} }
} }

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

@ -74,9 +74,9 @@ public class AddCommand extends PKCommand {
ChatColor color = element.getColor(); ChatColor color = element.getColor();
if (!(sender instanceof Player) || !((Player) sender).equals(target)) { if (!(sender instanceof Player) || !((Player) sender).equals(target)) {
sender.sendMessage(ChatColor.DARK_AQUA + target.getName() + color + " is also a" + (isVowel(element.getName().charAt(0)) ? "n " : " ") + element.getName() + (element.getType() != null ? element.getType().getBender() : "")); sender.sendMessage(ChatColor.DARK_AQUA + target.getName() + color + " is also a" + (isVowel(element.getName().charAt(0)) ? "n " : " ") + element.getName() + (element.getType() != null ? element.getType().getBender() : "") + ".");
} else { } else {
target.sendMessage(color + "You are also a" + (isVowel(element.getName().charAt(0)) ? "n " : " ") + element.getName() + (element.getType() != null ? element.getType().getBender() : "")); target.sendMessage(color + "You are also a" + (isVowel(element.getName().charAt(0)) ? "n " : " ") + element.getName() + (element.getType() != null ? element.getType().getBender() : "") + ".");
} }
GeneralMethods.saveElements(bPlayer); GeneralMethods.saveElements(bPlayer);
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, target, element, Result.ADD)); Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, target, element, Result.ADD));

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

@ -97,17 +97,9 @@ public class ChooseCommand extends PKCommand {
bPlayer.setElement(element); bPlayer.setElement(element);
ChatColor color = element != null ? element.getColor() : null; ChatColor color = element != null ? element.getColor() : null;
if (!(sender instanceof Player) || !((Player) sender).equals(target)) { if (!(sender instanceof Player) || !((Player) sender).equals(target)) {
if (element != Element.CHI) { sender.sendMessage(ChatColor.DARK_AQUA + target.getName() + color + " is now a" + (isVowel(element.getName().charAt(0)) ? "n " : " ") + element.getName() + (element.getType() != null ? element.getType().getBender() : "") + ".");
sender.sendMessage(ChatColor.DARK_AQUA + target.getName() + color + " is now a" + (isVowel(element.getName().charAt(0)) ? "n " : " ") + element.getName() + "bender.");
} else {
sender.sendMessage(ChatColor.DARK_AQUA + target.getName() + color + " is now a Chiblocker.");
}
} else { } else {
if (element != Element.CHI) { target.sendMessage(color + "You are now a" + (isVowel(element.getName().charAt(0)) ? "n " : " ") + element.getName() + (element.getType() != null ? element.getType().getBender() : "") + ".");
target.sendMessage(color + "You are now a" + (isVowel(element.getName().charAt(0)) ? "n " : " ") + element.getName() + "bender.");
} else {
target.sendMessage(color + "You are now a Chiblocker.");
}
} }