From ba06bb514ac20c6481531c0c24b253f90640e075 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Mon, 27 Jul 2015 16:09:06 +0200 Subject: [PATCH] Revert "First attempt to fix the email registation issue" This reverts commit cd3e7b5d431fd54eaedfdc090083ebfca15cd598. --- .../register/ProcessSyncronousEmailRegister.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java index c0c9e3fd..e7510eae 100644 --- a/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java +++ b/src/main/java/fr/xephi/authme/process/register/ProcessSyncronousEmailRegister.java @@ -2,7 +2,6 @@ package fr.xephi.authme.process.register; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitScheduler; import org.bukkit.scheduler.BukkitTask; import fr.xephi.authme.AuthMe; @@ -35,20 +34,11 @@ public class ProcessSyncronousEmailRegister implements Runnable { m.send(player, "vb_nonActiv"); int time = Settings.getRegistrationTimeout * 20; int msgInterval = Settings.getWarnMessageInterval; - - BukkitScheduler sched = plugin.getServer().getScheduler(); - -// if (time != 0) { -// LimboCache.getInstance().getLimboPlayer(name).getTimeoutTaskId().cancel(); -// BukkitTask id = Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new TimeoutTask(plugin, name, player), time); -// LimboCache.getInstance().getLimboPlayer(name).setTimeoutTaskId(id); -// } - if (time != 0) { - BukkitTask id = sched.runTaskLaterAsynchronously(plugin, new TimeoutTask(plugin, name, player), time); + LimboCache.getInstance().getLimboPlayer(name).getTimeoutTaskId().cancel(); + BukkitTask id = Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, new TimeoutTask(plugin, name, player), time); LimboCache.getInstance().getLimboPlayer(name).setTimeoutTaskId(id); } - LimboCache.getInstance().getLimboPlayer(name).getMessageTaskId().cancel(); BukkitTask nwMsg = Bukkit.getScheduler().runTaskAsynchronously(plugin, new MessageTask(plugin, name, m.send("login_msg"), msgInterval));