Redstoner/Modules
Archived
0
Fork 0
Code Activity

Fixed more bugs in the Friends module

Browse Source
This commit is contained in:
Minenash
2018-12-13 23:58:39 -05:00
parent c66a26e317
commit 43db25726c
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/redstoner/modules/friends/Friends.java
View File

@@ -140,6 +140,7 @@ public class Friends implements CoreModule {
} }
friends.add(p.getUniqueId().toString()); friends.add(p.getUniqueId().toString());
DataManager.setData(sender, "groups." + group, friends);
DataManager.save(sender); DataManager.save(sender);
getLogger().message(sender, "&e" + p.getName() + "&7 is now part of the group &e" + group + "&7!"); getLogger().message(sender, "&e" + p.getName() + "&7 is now part of the group &e" + group + "&7!");
@@ -176,23 +177,25 @@ public class Friends implements CoreModule {
JSONArray friends = ((JSONArray) DataManager.getOrDefault(sender, "friends", new JSONArray())); JSONArray friends = ((JSONArray) DataManager.getOrDefault(sender, "friends", new JSONArray()));
if (friends.contains(p.getUniqueId().toString())) { if (!friends.contains(p.getUniqueId().toString())) {
getLogger().message(sender, true, "You are already friends with this person!"); getLogger().message(sender, true, "You are not friends with that player!");
return true; return true;
} }
friends.remove(p.getUniqueId().toString()); friends.remove(p.getUniqueId().toString());
DataManager.setData(sender, "friends", friends);
DataManager.save(sender); DataManager.save(sender);
JSONArray friended_by = ((JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "friended_by", new JSONArray())); JSONArray friended_by = ((JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "friended_by", new JSONArray()));
DataManager.setData(p.getUniqueId().toString(), "friended_by", friended_by);
friended_by.remove(getID(sender)); friended_by.remove(getID(sender));
DataManager.save(p.getUniqueId().toString()); DataManager.save(p.getUniqueId().toString());
getLogger().message(sender, "You are now friends with &e" + p.getName() + "&7!"); getLogger().message(sender, "You are no longer friends with &e" + p.getName() + "&7!");
if (p instanceof Player) { if (p instanceof Player) {
getLogger().message((Player) p, "&e" + Utils.getName(sender) + "&7 added you as a friend!"); getLogger().message((Player) p, "&e" + Utils.getName(sender) + "&7 removed you as a friend!");
} else { } else {
JSONArray notifications = (JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "scheduled_notifications", new JSONArray()); JSONArray notifications = (JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "scheduled_notifications", new JSONArray());
@@ -223,18 +226,19 @@ public class Friends implements CoreModule {
JSONArray friends = ((JSONArray) DataManager.getOrDefault(sender, "groups." + group, new JSONArray())); JSONArray friends = ((JSONArray) DataManager.getOrDefault(sender, "groups." + group, new JSONArray()));
if (friends.contains(p.getUniqueId().toString())) { if (!friends.contains(p.getUniqueId().toString())) {
getLogger().message(sender, true, "This person already is part of that friendsgroup!"); getLogger().message(sender, true, "This person isn't a part of that friendsgroup!");
return true; return true;
} }
friends.add(p.getUniqueId().toString()); friends.add(p.getUniqueId().toString());
DataManager.setData(sender, "groups." + group, friends);
DataManager.save(sender); DataManager.save(sender);
getLogger().message(sender, "&e" + p.getName() + "&7 is now part of the group &e" + group + "&7!"); getLogger().message(sender, "&e" + p.getName() + "&7 is no longer a part of the group &e" + group + "&7!");
if (p instanceof Player) { if (p instanceof Player) {
getLogger().message((Player) p, "&e" + Utils.getName(sender) + " &7added you to their friendsgroup &e" + group + "&7!"); getLogger().message((Player) p, "&e" + Utils.getName(sender) + " &7removed you from their friendsgroup &e" + group + "&7!");
} else { } else {
JSONArray notifications = (JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "scheduled_notifications", new JSONArray()); JSONArray notifications = (JSONArray) DataManager.getOrDefault(p.getUniqueId().toString(), "scheduled_notifications", new JSONArray());
@@ -307,7 +311,7 @@ public class Friends implements CoreModule {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for (Object o : keys) { for (Object o : keys) {
sb.append("&e" + (String) o + "&7, "); sb.append("&e" + ((String) o).substring(6) + "&7, ");
} }
String out = sb.toString().replaceAll(", $", ""); String out = sb.toString().replaceAll(", $", "");