Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-03-01 10:11:09 +01:00
Code Issues Projects Releases Wiki Activity

Merged ProfileSaveTask and RemoveProfileFromMemory

Browse Source
This commit is contained in:
bm01 2012-06-10 06:55:27 +02:00
parent 5d0d89e74d
commit c9082083d1
4 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
View File

@ -32,7 +32,6 @@ import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.Party; import com.gmail.nossr50.party.Party;
import com.gmail.nossr50.runnables.BleedTimer; import com.gmail.nossr50.runnables.BleedTimer;
import com.gmail.nossr50.runnables.RemoveProfileFromMemoryTask;
import com.gmail.nossr50.skills.combat.Taming; import com.gmail.nossr50.skills.combat.Taming;
import com.gmail.nossr50.skills.gathering.BlastMining; import com.gmail.nossr50.skills.gathering.BlastMining;
import com.gmail.nossr50.skills.gathering.Fishing; import com.gmail.nossr50.skills.gathering.Fishing;
@ -145,9 +144,6 @@ public class PlayerListener implements Listener {
//Bleed it out //Bleed it out
BleedTimer.bleedOut(player); BleedTimer.bleedOut(player);
//Schedule PlayerProfile removal 2 minutes after quitting
plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new RemoveProfileFromMemoryTask(player), 2400);
} }
/** /**

15
src/main/java/com/gmail/nossr50/runnables/ProfileSaveTask.java
View File

@ -1,20 +1,21 @@
package com.gmail.nossr50.runnables; package com.gmail.nossr50.runnables;
import org.bukkit.entity.Player; import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.util.Users; import com.gmail.nossr50.util.Users;
public class ProfileSaveTask implements Runnable { public class ProfileSaveTask implements Runnable {
private Player player; private PlayerProfile playerProfile;
public ProfileSaveTask(Player player) { public ProfileSaveTask(PlayerProfile playerProfile) {
this.player = player; this.playerProfile = playerProfile;
} }
@Override @Override
public void run() { public void run() {
if (player != null) { playerProfile.save();
Users.getProfile(player).save();
if (!playerProfile.getPlayer().isOnline()) {
Users.getProfiles().remove(playerProfile);
} }
} }
} }

28
src/main/java/com/gmail/nossr50/runnables/RemoveProfileFromMemoryTask.java
View File

@ -1,28 +0,0 @@
package com.gmail.nossr50.runnables;
import org.bukkit.entity.Player;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.util.Users;
public class RemoveProfileFromMemoryTask implements Runnable {
private Player player;
public RemoveProfileFromMemoryTask(Player player) {
this.player = player;
}
@Override
public void run() {
PlayerProfile playerProfile = Users.getProfile(player);
//Check if the profile still exists (stuff like MySQL reconnection removes profiles)
if (playerProfile != null) {
playerProfile.save(); //We save here so players don't quit/reconnect to cause lag
if (!player.isOnline()) {
Users.removeUser(playerProfile);
}
}
}
}

9
src/main/java/com/gmail/nossr50/runnables/SaveTimer.java
View File

@ -1,9 +1,11 @@
package com.gmail.nossr50.runnables; package com.gmail.nossr50.runnables;
import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitScheduler;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.datatypes.PlayerProfile;
import com.gmail.nossr50.party.PartyManager; import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.util.Users;
public class SaveTimer implements Runnable { public class SaveTimer implements Runnable {
private final mcMMO plugin; private final mcMMO plugin;
@ -16,9 +18,10 @@ public class SaveTimer implements Runnable {
public void run() { public void run() {
//All player data will be saved periodically through this //All player data will be saved periodically through this
int count = 1; int count = 1;
BukkitScheduler bukkitScheduler = plugin.getServer().getScheduler();
for (Player player : plugin.getServer().getOnlinePlayers()) { for (PlayerProfile playerProfile : Users.getProfiles()) {
plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new ProfileSaveTask(player), count); bukkitScheduler.scheduleSyncDelayedTask(plugin, new ProfileSaveTask(playerProfile), count);
count++; count++;
} }