AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'server' into development

Browse Source
This commit is contained in:
Seth 2020-07-10 01:04:02 -07:00 committed by GitHub
commit 58872e2c32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/me/totalfreedom/totalfreedommod/command/Command_donator.java
View File

@ -54,7 +54,6 @@ public class Command_donator extends FreedomCommand
{ {
FUtil.bcastMsg(ChatColor.AQUA + name + ChatColor.GREEN + " has donated to the server!"); FUtil.bcastMsg(ChatColor.AQUA + name + ChatColor.GREEN + " has donated to the server!");
} }
Player player = getPlayer(name); Player player = getPlayer(name);
if (player != null) if (player != null)
@ -79,6 +78,8 @@ public class Command_donator extends FreedomCommand
try try
{ {
FUtil.postRequestToEndpoint(url, "POST", headers, payload); FUtil.postRequestToEndpoint(url, "POST", headers, payload);
String result = FUtil.postRequestToEndpoint(url, "POST", headers, payload);
msg(result);
} }
catch (IOException e) catch (IOException e)
{ {

1
src/main/java/me/totalfreedom/totalfreedommod/discord/PrivateMessageListener.java
View File

@ -29,7 +29,6 @@ public class PrivateMessageListener extends ListenerAdapter
{ {
Discord.syncRoles(admin, player.getDiscordID()); Discord.syncRoles(admin, player.getDiscordID());
} }
TotalFreedomMod.plugin().pl.save(player); TotalFreedomMod.plugin().pl.save(player);
Discord.LINK_CODES.remove(code); Discord.LINK_CODES.remove(code);
} }

3
src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java
View File

@ -104,6 +104,8 @@ public class PlayerData
.append("- Total Votes: ").append(totalVotes).append("\n") .append("- Total Votes: ").append(totalVotes).append("\n")
.append("- Tag: ").append(FUtil.colorize(tag)).append(ChatColor.GRAY).append("\n") .append("- Tag: ").append(FUtil.colorize(tag)).append(ChatColor.GRAY).append("\n")
.append("- Ride Mode: ").append(rideMode).append("\n") .append("- Ride Mode: ").append(rideMode).append("\n")
.append("- Tag: ").append(tag).append("\n")
.append("- Ride Mode: ").append(rideMode)
.append("- Backup Codes: ").append(backupCodes.size()).append("/10").append("\n"); .append("- Backup Codes: ").append(backupCodes.size()).append("/10").append("\n");
return output.toString(); return output.toString();
@ -233,6 +235,7 @@ public class PlayerData
put("discord_id", discordID); put("discord_id", discordID);
put("backup_codes", FUtil.listToString(backupCodes)); put("backup_codes", FUtil.listToString(backupCodes));
put("donator", donator); put("donator", donator);
put("donator", masterBuilder);
put("master_builder", masterBuilder); put("master_builder", masterBuilder);
put("verification", verification); put("verification", verification);
put("ride_mode", rideMode); put("ride_mode", rideMode);