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

Update report message if a player reports another player multiple times

Browse Source
This commit is contained in:
Keir Nellyer 2016-07-18 18:37:21 +01:00
parent 103f31afc1
commit 976e8788b7
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
View File

@ -1,7 +1,6 @@
package mineplex.core.common.util;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;

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

@ -82,10 +82,10 @@ public class ReportManager
* @param reporter the player creating the report
* @param suspect the player that is being reported
* @param category the category of the report
* @param reason the reason this player reported the other
* @param message the reason this player reported the other
* @return a future which when completed contains a {@link Report} instance of the report just created or added to
*/
public CompletableFuture<Report> createReport(Player reporter, Player suspect, ReportCategory category, String reason)
public CompletableFuture<Report> createReport(Player reporter, Player suspect, ReportCategory category, String message)
{
int reporterId = _clientManager.Get(reporter).getAccountId();
int suspectId = _clientManager.Get(suspect).getAccountId();
@ -97,7 +97,18 @@ public class ReportManager
{
if (report != null)
{
report.addReportReason(new ReportMessage(reporterId, reason, _serverName, _serverWeight));
ReportMessage reportMessage = report.getReportMessage(reporterId);
if (reportMessage != null)
{
reportMessage.setMessage(message);
}
else
{
reportMessage = new ReportMessage(reporterId, message, _serverName, _serverWeight);
report.addReportReason(reportMessage);
}
saveReport(report).join();
}
});

10
Plugins/Mineplex.Core/src/mineplex/core/report/data/Report.java
View File

@ -53,6 +53,16 @@ public class Report
_reportMessages.put(reportMessage.getReporterId(), reportMessage);
}
public Map<Integer, ReportMessage> getReportMessages()
{
return _reportMessages;
}
public ReportMessage getReportMessage(int accountId)
{
return _reportMessages.get(accountId);
}
public Set<Integer> getReporterIds()
{
return _reportMessages.keySet();

5
Plugins/Mineplex.Core/src/mineplex/core/report/data/ReportMessage.java
View File

@ -46,6 +46,11 @@ public class ReportMessage
return _message;
}
public void setMessage(String message)
{
_message = message;
}
public String getServer()
{
return _server;