JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show message when report has been closed

Browse Source 
Also run Bukkit API methods synchronously.
This commit is contained in:
Keir Nellyer 2016-07-09 15:24:41 -04:00
parent e26ced1438
commit 400a6adab2
5 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
View File

@ -11,6 +11,7 @@ import mineplex.core.chatsnap.command.PushSnapshotsCommand;
import mineplex.core.chatsnap.command.PushSnapshotsHandler; import mineplex.core.chatsnap.command.PushSnapshotsHandler;
import mineplex.core.command.CommandCenter; import mineplex.core.command.CommandCenter;
import mineplex.core.common.jsonchat.JsonMessage; import mineplex.core.common.jsonchat.JsonMessage;
import mineplex.core.common.util.BukkitFuture;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.portal.Portal; import mineplex.core.portal.Portal;
@ -200,13 +201,22 @@ public class ReportManager
if (reportCloser != null) if (reportCloser != null)
{ {
Optional<String> reasonOptional = reportResult.getReason(); BukkitFuture.run(() ->
String reason = reasonOptional.isPresent() ? reasonOptional.get() : "No reason specified."; {
Optional<String> reasonOptional = reportResult.getReason();
String prefix = getReportPrefix(reportId);
String reason = reasonOptional.isPresent() ? reasonOptional.get() : "No reason specified.";
// todo new punish gui reportCloser.sendMessage(
CommandCenter.Instance.onPlayerCommandPreprocess( F.main(prefix,
new PlayerCommandPreprocessEvent(reportCloser, C.cGreen + "Report marked as: " + C.cGold + reportResult.getType().getName()));
String.format("/punish %s Report #%s - %s", suspectName, reportId, reason))); reportCloser.sendMessage(F.main(prefix, C.cGold + reason));
// todo new punish gui
CommandCenter.Instance.onPlayerCommandPreprocess(
new PlayerCommandPreprocessEvent(reportCloser,
String.format("/punish %s Report #%s - %s", suspectName, reportId, reason)));
});
} }
}); });
}); });

2
Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
View File

@ -412,7 +412,7 @@ public class ReportRepository
PreparedStatement setReportResultStatement = connection.prepareStatement(SET_REPORT_RESULT); PreparedStatement setReportResultStatement = connection.prepareStatement(SET_REPORT_RESULT);
ReportResult reportResult = reportResultOptional.get(); ReportResult reportResult = reportResultOptional.get();
setReportResultStatement.setLong(1, reportId); // report id setReportResultStatement.setLong(1, reportId); // report id
setReportResultStatement.setInt(2, reportResult.getResultType().getId()); // result id setReportResultStatement.setInt(2, reportResult.getType().getId()); // result id
setReportResultStatement.setString(3, reportResult.getReason().orElse(null)); // reason setReportResultStatement.setString(3, reportResult.getReason().orElse(null)); // reason
setReportResultStatement.setTimestamp(4, new Timestamp(reportResult.getClosedTime().getTime())); // closed time setReportResultStatement.setTimestamp(4, new Timestamp(reportResult.getClosedTime().getTime())); // closed time
setReportResultStatement.execute(); setReportResultStatement.execute();

2
Plugins/Mineplex.Core/src/mineplex/core/report/ReportResult.java
View File

@ -24,7 +24,7 @@ public class ReportResult
_closedTime = closedTime; _closedTime = closedTime;
} }
public ReportResultType getResultType() public ReportResultType getType()
{ {
return _resultType; return _resultType;
} }

9
Plugins/Mineplex.Core/src/mineplex/core/report/ReportResultType.java
View File

@ -1,5 +1,7 @@
package mineplex.core.report; package mineplex.core.report;
import org.apache.commons.lang3.StringUtils;
/** /**
* Contains all possible outcomes for a report. * Contains all possible outcomes for a report.
*/ */
@ -12,11 +14,13 @@ public enum ReportResultType
private final int _id; private final int _id;
private final boolean _globalStat; private final boolean _globalStat;
private final String _name;
ReportResultType(int id, boolean globalStat) ReportResultType(int id, boolean globalStat)
{ {
_id = id; _id = id;
_globalStat = globalStat; _globalStat = globalStat;
_name = StringUtils.capitalize(name().toLowerCase().replace('_', ' '));
} }
public int getId() public int getId()
@ -29,6 +33,11 @@ public enum ReportResultType
return _globalStat; return _globalStat;
} }
public String getName()
{
return _name;
}
public static ReportResultType getById(int id) public static ReportResultType getById(int id)
{ {
for (ReportResultType resultType : values()) for (ReportResultType resultType : values())

2
Plugins/Mineplex.Core/src/mineplex/core/report/command/ReportCloseCommand.java
View File

@ -22,7 +22,7 @@ public class ReportCloseCommand extends CommandBase<ReportPlugin>
@Override @Override
public void Execute(final Player player, final String[] args) public void Execute(final Player player, final String[] args)
{ {
if(args == null || args.length < 2) if (args == null || args.length < 2)
{ {
UtilPlayer.message(player, F.main(Plugin.getName(), C.cRed + "Your arguments are inappropriate for this command!")); UtilPlayer.message(player, F.main(Plugin.getName(), C.cRed + "Your arguments are inappropriate for this command!"));
} }