Cleanup session loading.

Apparently the spigot server stores time-lock between logout and login, but not weather-lock. This should work around any such issues by re-applying handlers on login.
EngineHub · Feb 12, 2019 · 1f1e6ee · 1f1e6ee
1 parent 96e7c43
commit 1f1e6ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...d-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java b/...d-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java
@@ -151,8 +151,6 @@ public void onPlayerJoin(PlayerJoinEvent event) {
         }
 
         Events.fire(new ProcessPlayerEvent(player));
-
-        WorldGuard.getInstance().getPlatform().getSessionManager().get(localPlayer); // Initializes a session
     }
 
     @EventHandler(ignoreCancelled = true)

diff --git a/...dguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/session/BukkitSessionManager.java b/...dguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/session/BukkitSessionManager.java
@@ -59,13 +59,15 @@ public void resetAllStates() {
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
         // Pre-load a session
-        get(WorldGuardPlugin.inst().wrapPlayer(event.getPlayer()));
+        LocalPlayer player = WorldGuardPlugin.inst().wrapPlayer(event.getPlayer());
+        get(player).initialize(player);
     }
 
     @Override
     public void run() {
         for (Player player : Bukkit.getServer().getOnlinePlayers()) {
-            get(new BukkitPlayer(WorldGuardPlugin.inst(), player)).tick(new BukkitPlayer(WorldGuardPlugin.inst(), player));
+            LocalPlayer localPlayer = WorldGuardPlugin.inst().wrapPlayer(player);
+            get(localPlayer).tick(localPlayer);
         }
     }