fix merging fuck up, fuck squashing

This commit is contained in:
Seth 2020-07-10 01:13:18 -07:00
parent 58872e2c32
commit f6bf485c0d
No known key found for this signature in database
GPG Key ID: A7BAB4E14F089CF3
2 changed files with 0 additions and 5 deletions

View File

@ -78,8 +78,6 @@ 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)
{ {

View File

@ -104,8 +104,6 @@ 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();
@ -235,7 +233,6 @@ 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);