Skip to content

Commit 23c8c07

Browse files
committed
Attempt to fix #678 by changing RegisterProcessor to a task
1 parent e525e0c commit 23c8c07

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

Plan/src/main/java/com/djrapitops/plan/system/listeners/bukkit/PlayerOnlineListener.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.djrapitops.plan.system.processing.processors.player.*;
99
import com.djrapitops.plugin.api.systems.NotificationCenter;
1010
import com.djrapitops.plugin.api.utility.log.Log;
11+
import com.djrapitops.plugin.task.RunnableFactory;
1112
import org.bukkit.entity.Player;
1213
import org.bukkit.event.EventHandler;
1314
import org.bukkit.event.EventPriority;
@@ -96,7 +97,7 @@ private void actOnJoinEvent(PlayerJoinEvent event) {
9697

9798
SessionCache.getInstance().cacheSession(uuid, new Session(uuid, time, world, gm));
9899

99-
Processing.submit(
100+
RunnableFactory.createNew("Player Register: " + uuid,
100101
new RegisterProcessor(uuid, player::getFirstPlayed, playerName,
101102
new IPUpdateProcessor(uuid, address, time),
102103
new NameProcessor(uuid, playerName, displayName),

Plan/src/main/java/com/djrapitops/plan/system/listeners/sponge/SpongePlayerListener.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.djrapitops.plan.system.processing.processors.player.*;
99
import com.djrapitops.plugin.api.systems.NotificationCenter;
1010
import com.djrapitops.plugin.api.utility.log.Log;
11+
import com.djrapitops.plugin.task.RunnableFactory;
1112
import org.spongepowered.api.Sponge;
1213
import org.spongepowered.api.data.key.Keys;
1314
import org.spongepowered.api.entity.living.player.Player;
@@ -99,7 +100,7 @@ private void actOnJoinEvent(ClientConnectionEvent.Join event) {
99100

100101
SessionCache.getInstance().cacheSession(uuid, new Session(uuid, time, world, gm));
101102

102-
Processing.submit(
103+
RunnableFactory.createNew("Player Register: " + uuid,
103104
new RegisterProcessor(uuid, () -> time, playerName,
104105
new IPUpdateProcessor(uuid, address, time),
105106
new NameProcessor(uuid, playerName, displayName),

Plan/src/main/java/com/djrapitops/plan/system/processing/processors/player/RegisterProcessor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
package com.djrapitops.plan.system.processing.processors.player;
66

77
import com.djrapitops.plan.system.database.databases.Database;
8-
import com.djrapitops.plan.system.processing.CriticalRunnable;
98
import com.djrapitops.plan.system.processing.Processing;
9+
import com.djrapitops.plugin.task.AbsRunnable;
1010
import com.djrapitops.plugin.utilities.Verify;
1111

1212
import java.util.UUID;
@@ -17,14 +17,15 @@
1717
*
1818
* @author Rsl1122
1919
*/
20-
public class RegisterProcessor implements CriticalRunnable {
20+
public class RegisterProcessor extends AbsRunnable {
2121

2222
private final UUID uuid;
2323
private final Supplier<Long> registered;
2424
private final String name;
2525
private final Runnable[] afterProcess;
2626

2727
public RegisterProcessor(UUID uuid, Supplier<Long> registered, String name, Runnable... afterProcess) {
28+
super(RegisterProcessor.class.getSimpleName());
2829
this.uuid = uuid;
2930
this.registered = registered;
3031
this.name = name;
@@ -46,6 +47,7 @@ public void run() {
4647
for (Runnable runnable : afterProcess) {
4748
Processing.submit(runnable);
4849
}
50+
cancel();
4951
}
5052
}
5153
}

0 commit comments

Comments
 (0)