thmsdy
/
FPChatX
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fixed issues preventing badges from being equipped

This commit is contained in:
Ghoti 2020-10-29 23:29:40 -05:00
parent 711ffca758
commit 3229e6d43b
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/fpghoti/fpchatx/badge/BadgeData.java
View File

@ -73,7 +73,7 @@ public class BadgeData {
if(!hasSlotPermission(slot)) { if(!hasSlotPermission(slot)) {
return BadgeEquipResult.NO_PERMISSION_SLOT; return BadgeEquipResult.NO_PERMISSION_SLOT;
} }
if(!player.hasPermission(badge.getPerm())) { if(!player.hasPermission(badge.getPerm()) && !badges.containsId(badge.getId())) {
return BadgeEquipResult.NO_PERMISSION_BADGE; return BadgeEquipResult.NO_PERMISSION_BADGE;
} }
return setBadge(slot, badge); return setBadge(slot, badge);
@ -87,7 +87,7 @@ public class BadgeData {
for(int slot = 1; slot <= FPChat.getPlugin().getMainConfig().getMaxBadgeSlots(); slot++) { for(int slot = 1; slot <= FPChat.getPlugin().getMainConfig().getMaxBadgeSlots(); slot++) {
if(hasSlotPermission(slot)) { if(hasSlotPermission(slot)) {
Badge badge = slots.get(slot); Badge badge = slots.get(slot);
if(badge != null && badge.isEnabled() && player.hasPermission(badge.getPerm())) { if(badge != null && badge.isEnabled() && (player.hasPermission(badge.getPerm()) || badges.containsId(badge.getId()))) {
appearance = badge.getContents() + appearance; appearance = badge.getContents() + appearance;
} }
} }
@ -95,7 +95,7 @@ public class BadgeData {
return appearance; return appearance;
} }
public String toString() { public String toString() { //
int max = FPChat.getPlugin().getMainConfig().getMaxBadgeSlots(); int max = FPChat.getPlugin().getMainConfig().getMaxBadgeSlots();
String val = ""; String val = "";
boolean first = true; boolean first = true;
@ -117,19 +117,21 @@ public class BadgeData {
private void setLoadoutFromString(String str) { private void setLoadoutFromString(String str) {
String[] array = str.split(","); String[] array = str.split(",");
HashMap<Integer, Badge> loadout = new HashMap<Integer, Badge>(); slots = new HashMap<Integer, Badge>();
for(int i = 0; i < array.length; i++) { for(int i = 0; i < array.length; i++) {
int slot = i + 1; int slot = i + 1;
String item = array[i]; String item = array[i];
if(Util.isDigit(item)) { if(Util.isDigit(item)) {
int id = Integer.parseInt(item); int id = Integer.parseInt(item);
if(Badge.getList().containsId(id)) { Badge badge = Badge.getList().get(id);
loadout.put(slot, Badge.getList().get(id)); if(badge != null) {
slots.put(slot, badge);
}else { }else {
loadout.put(slot, Badge.getZero()); System.out.println("BADGE " + id + " NULL!"); //TODO <---------------------------
slots.put(slot, Badge.getZero());
} }
}else { }else {
loadout.put(slot, Badge.getZero()); slots.put(slot, Badge.getZero());
} }
} }
} }
@ -162,7 +164,7 @@ public class BadgeData {
public void savePlayerData() { public void savePlayerData() {
saveNewBadgesToSQL(); saveNewBadgesToSQL();
setBadgeListSQLString(badges.toString()); setBadgeListSQLString(badges.toString());
setLoadoutSQLString(toString()); setLoadoutSQLString(toString()); //TODO Fix ToString always returning 0,0,0
} }
private void saveNewBadgesToSQL() { private void saveNewBadgesToSQL() {

2
src/main/java/com/fpghoti/fpchatx/badge/BadgeList.java
View File

@ -108,7 +108,7 @@ public class BadgeList implements Iterable<Badge>{
return b; return b;
} }
} }
return Badge.getZero(); return null;
} }
public Badge getIndex(int index) { public Badge getIndex(int index) {