Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-12 15:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Upstream

Browse Source 
0036e06 Alter the CUI lifecycle to be more consistent and reliable (1633)
This commit is contained in:
NotMyFault
2021-06-05 11:27:27 +02:00
parent d1af6c38e7
commit 75fbe654ee
17 changed files with 326 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
worldedit-core/src/main/java/com/sk89q/worldedit/session/SessionManager.java
View File

@ -30,6 +30,7 @@ import com.sk89q.worldedit.command.tool.InvalidToolBindException;
import com.sk89q.worldedit.command.tool.Tool;
import com.sk89q.worldedit.entity.Player;
import com.sk89q.worldedit.event.platform.ConfigurationLoadEvent;
import com.sk89q.worldedit.event.platform.SessionIdleEvent;
import com.sk89q.worldedit.extension.platform.Locatable;
import com.sk89q.worldedit.internal.util.LogManagerCompat;
import com.sk89q.worldedit.session.request.Request;
@ -132,6 +133,9 @@ public class SessionManager {
checkNotNull(owner);
SessionHolder stored = sessions.get(getKey(owner));
if (stored != null) {
if (stored.sessionIdle && stored.key.isActive()) {
stored.sessionIdle = false;
}
return stored.session;
} else {
return null;
@ -350,6 +354,18 @@ public class SessionManager {
store = new JsonFileSessionStore(dir);
}
@Subscribe
public void onSessionIdle(final SessionIdleEvent event) {
SessionHolder holder = this.sessions.get(getKey(event.getKey()));
if (holder != null && !holder.sessionIdle) {
holder.sessionIdle = true;
LocalSession session = holder.session;
// Perform any session cleanup for data that should not be persisted.
session.onIdle();
}
}
/**
* Stores the owner of a session, the session, and the last active time.
*/
@ -357,6 +373,7 @@ public class SessionManager {
private final SessionKey key;
private final LocalSession session;
private long lastActive = System.currentTimeMillis();
private boolean sessionIdle = false;
private SessionHolder(SessionKey key, LocalSession session) {
this.key = key;