ChromaGaming/AliPresents
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity

Finally finished first wave of bugfixing #35

Merged
alisolarflare merged 11 commits from Bugfix into master 2016-12-19 03:19:49 +00:00
Conversation 0 Commits 11 Files changed 29 +12 -1
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ba528112d5 - Show all commits

5
src/buttondevteam/alipresents/components/flaircolour/FlairColourAPI.java
View file

@ -6,7 +6,10 @@ import com.earth2me.essentials.User;
public class FlairColourAPI { public class FlairColourAPI {
public static void recolourPlayer(User user, DyeColor dyecolour){ public static void recolourPlayer(User user, DyeColor dyecolour){
String name = user._getNickname(); String name = "";
if ((name = user._getNickname()) == null && (name = user.getDisplayName()) == null){
name = user.getName();
}
String sanitizedName = ""; String sanitizedName = "";
for(int i = 0; i < name.length(); i++){ for(int i = 0; i < name.length(); i++){
if (name.charAt(i) == '§'){ if (name.charAt(i) == '§'){

8
src/buttondevteam/alipresents/components/flaircolour/portals/PortalListener.java
View file

@ -66,6 +66,14 @@ public class PortalListener implements Listener{
}else{ }else{
return; return;
} }
if (essentials.getUser(player) == null){
player.sendMessage("Error! essentials.getUser() returns null!");
throw new NullPointerException();
}
if (woolColour == null){
player.sendMessage("Error! Wool colour returns null!");
throw new NullPointerException();
}
FlairColourAPI.recolourPlayer(essentials.getUser(player), woolColour); FlairColourAPI.recolourPlayer(essentials.getUser(player), woolColour);
component.playersToBeFlaired.remove(player.getName()); component.playersToBeFlaired.remove(player.getName());