Upstream/PlayerStats
1
0
Fork 0
mirror of https://github.com/itHotL/PlayerStats.git synced 2025-02-02 23:31:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Limited statRequests to one at a time per commandSender (#49)

Browse Source
This commit is contained in:
Artemis-the-gr8 2022-07-06 21:33:13 +02:00
parent 3cf41c9cfa
commit fac5ee0a6b
3 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/gmail/artemis/the/gr8/playerstats/ThreadManager.java
View File

@ -9,6 +9,8 @@ import com.gmail.artemis.the.gr8.playerstats.utils.MyLogger;
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import org.bukkit.command.CommandSender;
import java.util.HashMap;
public class ThreadManager {
@ -21,8 +23,9 @@ public class ThreadManager {
private static ConfigHandler config;
private static MessageWriter messageWriter;
private ReloadThread reloadThread;
private StatThread statThread;
private ReloadThread lastActiveReloadThread;
private StatThread lastActiveStatThread;
private final HashMap<String, Thread> statThreads;
private static long lastRecordedCalcTime;
public ThreadManager(BukkitAudiences a, ConfigHandler c, MessageWriter m, Main p) {
@ -31,6 +34,7 @@ public class ThreadManager {
messageWriter = m;
plugin = p;
statThreads = new HashMap<>();
statThreadID = 0;
reloadThreadID = 0;
lastRecordedCalcTime = 0;
@ -38,22 +42,31 @@ public class ThreadManager {
}
public void startReloadThread(CommandSender sender) {
if (reloadThread == null || !reloadThread.isAlive()) {
if (lastActiveReloadThread == null || !lastActiveReloadThread.isAlive()) {
reloadThreadID += 1;
reloadThread = new ReloadThread(adventure, config, messageWriter, threshold, reloadThreadID, statThread, sender);
reloadThread.start();
lastActiveReloadThread = new ReloadThread(adventure, config, messageWriter, threshold, reloadThreadID, lastActiveStatThread, sender);
lastActiveReloadThread.start();
}
else {
MyLogger.threadAlreadyRunning(reloadThread.getName());
MyLogger.threadAlreadyRunning(lastActiveReloadThread.getName());
}
}
public void startStatThread(StatRequest request) {
statThreadID += 1;
String cmdSender = request.getCommandSender().getName();
statThread = new StatThread(adventure, config, messageWriter, plugin, statThreadID, threshold, request, reloadThread);
statThread.start();
if (statThreads.containsKey(cmdSender)) {
Thread runningThread = statThreads.get(cmdSender);
if (runningThread.isAlive()) {
adventure.sender(request.getCommandSender()).sendMessage(messageWriter.requestAlreadyRunning(request.isBukkitConsoleSender()));
} else {
startNewStatThread(request);
}
} else {
startNewStatThread(request);
}
}
/** Store the duration in milliseconds of the last top-stat-lookup
@ -67,4 +80,10 @@ public class ThreadManager {
public static long getLastRecordedCalcTime() {
return lastRecordedCalcTime;
}
private void startNewStatThread(StatRequest request) {
lastActiveStatThread = new StatThread(adventure, config, messageWriter, plugin, statThreadID, threshold, request, lastActiveReloadThread);
statThreads.put(request.getCommandSender().getName(), lastActiveStatThread);
lastActiveStatThread.start();
}
}

7
src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/MessageWriter.java
View File

@ -99,6 +99,13 @@ public class MessageWriter {
"\"" + subStatEntry + "\" is not a valid " + getSubStatTypeName(statType) + "!"));
}
public TextComponent requestAlreadyRunning(boolean isBukkitConsole) {
return componentFactory.pluginPrefixComponent(isBukkitConsole)
.append(space())
.append(componentFactory.messageComponent().content(
"Please wait for your previous lookup to finish!"));
}
public TextComponent unknownError(boolean isBukkitConsole) {
return componentFactory.pluginPrefixComponent(isBukkitConsole)
.append(space())

2
src/main/java/com/gmail/artemis/the/gr8/playerstats/statistic/StatThread.java
View File

@ -43,7 +43,7 @@ public class StatThread extends Thread {
messageWriter = m;
plugin = p;
this.setName("StatThread-" + ID);
this.setName("StatThread-" + request.getCommandSender().getName() + "-" + ID);
MyLogger.threadCreated(this.getName());
}