Merge branch 'server' into development

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

View file

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

View file

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

View file

@ -104,6 +104,8 @@ public class PlayerData
.append("- Total Votes: ").append(totalVotes).append("\n")
.append("- Tag: ").append(FUtil.colorize(tag)).append(ChatColor.GRAY).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");
return output.toString();
@ -233,6 +235,7 @@ public class PlayerData
put("discord_id", discordID);
put("backup_codes", FUtil.listToString(backupCodes));
put("donator", donator);
put("donator", masterBuilder);
put("master_builder", masterBuilder);
put("verification", verification);
put("ride_mode", rideMode);