Refactoring a bunch of stuff, more refactoring to come

This commit is contained in:
nossr50
2020-08-17 21:15:27 -07:00
parent 0e9e1f5133
commit daada1a643
161 changed files with 1934 additions and 2575 deletions

View File

@@ -1,14 +1,13 @@
package com.gmail.nossr50.runnables.player;
import com.gmail.nossr50.datatypes.player.McMMOPlayer;
import com.gmail.nossr50.util.player.UserManager;
import org.bukkit.scheduler.BukkitRunnable;
public class ClearRegisteredXPGainTask extends BukkitRunnable {
@Override
public void run() {
for (McMMOPlayer mcMMOPlayer : UserManager.getPlayers()) {
mcMMOPlayer.getProfile().purgeExpiredXpGains();
for (McMMOPlayer mmoPlayer : mcMMO.getUserManager().getPlayers()) {
mmoPlayer.purgeExpiredXpGains();
}
}
}

View File

@@ -0,0 +1,18 @@
package com.gmail.nossr50.runnables.player;
import com.gmail.nossr50.datatypes.player.MMODataSnapshot;
import com.gmail.nossr50.mcMMO;
import org.bukkit.scheduler.BukkitRunnable;
public class PersistentPlayerDataSaveTask extends BukkitRunnable {
private final MMODataSnapshot dataSnapshot;
public PersistentPlayerDataSaveTask(MMODataSnapshot dataSnapshot) {
this.dataSnapshot = dataSnapshot;
}
@Override
public void run() {
mcMMO.getDatabaseManager().saveUser(dataSnapshot);
}
}

View File

@@ -8,7 +8,6 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.runnables.commands.McScoreboardKeepTask;
import com.gmail.nossr50.util.EventUtils;
import com.gmail.nossr50.util.Misc;
import com.gmail.nossr50.util.player.UserManager;
import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
import org.bukkit.Server;
import org.bukkit.entity.Player;
@@ -72,10 +71,10 @@ public class PlayerProfileLoadingTask extends BukkitRunnable {
}
private class ApplySuccessfulProfile extends BukkitRunnable {
private final McMMOPlayer mcMMOPlayer;
private final McMMOPlayer mmoPlayer;
private ApplySuccessfulProfile(McMMOPlayer mcMMOPlayer) {
this.mcMMOPlayer = mcMMOPlayer;
private ApplySuccessfulProfile(McMMOPlayer mmoPlayer) {
this.mmoPlayer = mmoPlayer;
}
// Synchronized task
@@ -87,9 +86,9 @@ public class PlayerProfileLoadingTask extends BukkitRunnable {
return;
}
mcMMOPlayer.setupPartyData();
UserManager.track(mcMMOPlayer);
mcMMOPlayer.actualizeRespawnATS();
mmoPlayer.setupPartyData();
mcMMO.getUserManager().track(mmoPlayer);
mmoPlayer.actualizeRespawnATS();
if (Config.getInstance().getScoreboardsEnabled()) {
ScoreboardManager.setupPlayer(player);

View File

@@ -1,19 +0,0 @@
package com.gmail.nossr50.runnables.player;
import com.gmail.nossr50.datatypes.player.PlayerProfile;
import org.bukkit.scheduler.BukkitRunnable;
public class PlayerProfileSaveTask extends BukkitRunnable {
private final PlayerProfile playerProfile;
private final boolean isSync;
public PlayerProfileSaveTask(PlayerProfile playerProfile, boolean isSync) {
this.playerProfile = playerProfile;
this.isSync = isSync;
}
@Override
public void run() {
playerProfile.save(isSync);
}
}