1
mirror of https://github.com/CarmJos/cn2b2t-project.git synced 2026-06-04 18:17:19 +08:00

修复数据加载

This commit is contained in:
carm
2020-05-28 18:55:32 +08:00
parent bdde36575a
commit 9bd3ca159a
3 changed files with 17 additions and 19 deletions
@@ -14,14 +14,16 @@ import org.cn2b2t.common.Main;
import org.cn2b2t.common.functions.ProfileData; import org.cn2b2t.common.functions.ProfileData;
import org.cn2b2t.common.managers.ScoreboardManager; import org.cn2b2t.common.managers.ScoreboardManager;
import org.cn2b2t.common.runnables.RestartRunnable; import org.cn2b2t.common.runnables.RestartRunnable;
import org.cn2b2t.core.events.UserLoadedEvent; import org.cn2b2t.core.events.UserHandlerLoadedEvent;
public class ScoreboardListener implements Listener { public class ScoreboardListener implements Listener {
@EventHandler @EventHandler
public void onJoin(UserLoadedEvent e) { public void onJoin(UserHandlerLoadedEvent e) {
if (ProfileData.get(e.getPlayer()).showScoreboard) addScoreboard(e.getPlayer()); if (e.getHandler() instanceof ProfileData
&& ProfileData.get(e.getUser()).showScoreboard)
addScoreboard(e.getUser().getPlayer());
} }
public static void addScoreboard(Player p) { public static void addScoreboard(Player p) {
@@ -1,21 +1,16 @@
package org.cn2b2t.core.listener; package org.cn2b2t.core.listener;
import org.cn2b2t.core.managers.users.UserValueManager;
import org.cn2b2t.core.managers.utils.UserManager;
import org.cn2b2t.core.modules.users.User;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.cn2b2t.core.managers.utils.UserManager;
import org.cn2b2t.core.modules.users.User;
public class JoinListener implements Listener { public class JoinListener implements Listener {
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void loadUser(PlayerJoinEvent e) { public void loadUser(PlayerJoinEvent e) {
User u = UserManager.registeruser(e.getPlayer()); User u = UserManager.registeruser(e.getPlayer());
@@ -46,7 +46,7 @@ public class User {
public User(Player player) { public User(Player player) {
this.player = player; this.player = player;
loadData();
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
@@ -93,6 +93,7 @@ public class User {
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
loadData();
fullLoaded = true; fullLoaded = true;
Bukkit.getPluginManager().callEvent(new UserLoadedEvent(User.this)); Bukkit.getPluginManager().callEvent(new UserLoadedEvent(User.this));
} }