EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-02 01:46:45 +01:00
Code Issues Projects Releases Wiki Activity

Update user async loading/saving

Browse Source
This commit is contained in:
Harry5573OP 2014-05-19 01:24:34 +01:00
parent 2f74d53dbe
commit 24fc7f6a6f
4 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java
View File

@ -116,13 +116,17 @@ public final class SQLDatabaseManager implements DatabaseManager {
} }
public void saveUser(final PlayerProfile profile) { public void saveUser(final PlayerProfile profile) {
if (!checkConnected()) { if (profile == null || !profile.isLoaded()) {
return; return;
} }
mcMMO.p.getServer().getScheduler().runTaskAsynchronously(mcMMO.p, new Runnable() { mcMMO.p.getServer().getScheduler().runTaskAsynchronously(mcMMO.p, new Runnable() {
@Override @Override
public void run() { public void run() {
if (!checkConnected()) {
return;
}
int userId = readId(profile.getPlayerName()); int userId = readId(profile.getPlayerName());
if (userId == -1) { if (userId == -1) {
newUser(profile.getPlayerName()); newUser(profile.getPlayerName());
@ -355,7 +359,6 @@ public final class SQLDatabaseManager implements DatabaseManager {
return loadPlayerProfile(playerName, create, true); return loadPlayerProfile(playerName, create, true);
} }
private PlayerProfile loadPlayerProfile(String playerName, boolean create, boolean retry) { private PlayerProfile loadPlayerProfile(String playerName, boolean create, boolean retry) {
if (!checkConnected()) { if (!checkConnected()) {
@ -464,13 +467,15 @@ public final class SQLDatabaseManager implements DatabaseManager {
resultSet.next(); resultSet.next();
destination.saveUser(loadFromResult(playerName, resultSet)); destination.saveUser(loadFromResult(playerName, resultSet));
resultSet.close(); resultSet.close();
} catch (SQLException e) { }
catch (SQLException e) {
// Ignore // Ignore
} }
convertedUsers++; convertedUsers++;
Misc.printProgress(convertedUsers, progressInterval, startMillis); Misc.printProgress(convertedUsers, progressInterval, startMillis);
} }
} catch (SQLException e) { }
catch (SQLException e) {
printErrors(e); printErrors(e);
} }
finally { finally {

67
src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java
View File

@ -40,13 +40,16 @@ import com.gmail.nossr50.util.StringUtils;
import com.gmail.nossr50.util.skills.ParticleEffectUtils; import com.gmail.nossr50.util.skills.ParticleEffectUtils;
import com.gmail.nossr50.util.skills.PerksUtils; import com.gmail.nossr50.util.skills.PerksUtils;
import com.gmail.nossr50.util.skills.SkillUtils; import com.gmail.nossr50.util.skills.SkillUtils;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level; import java.util.logging.Level;
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Server; import org.bukkit.Server;
@ -57,8 +60,8 @@ import org.bukkit.metadata.FixedMetadataValue;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
public class McMMOPlayer { public class McMMOPlayer {
private Player player; private final Player player;
private PlayerProfile playerProfile; private PlayerProfile profile;
private final ConcurrentHashMap<SkillType, SkillManager> skillManagers = new ConcurrentHashMap<SkillType, SkillManager>(); private final ConcurrentHashMap<SkillType, SkillManager> skillManagers = new ConcurrentHashMap<SkillType, SkillManager>();
@ -92,7 +95,6 @@ public class McMMOPlayer {
private final FixedMetadataValue playerMetadata; private final FixedMetadataValue playerMetadata;
public interface Callback { public interface Callback {
public void done(String playerName, PlayerProfile profile); public void done(String playerName, PlayerProfile profile);
} }
@ -102,14 +104,17 @@ public class McMMOPlayer {
final String playerName = player.getName(); final String playerName = player.getName();
this.player = player; this.player = player;
playerMetadata = new FixedMetadataValue(mcMMO.p, playerName); playerMetadata = new FixedMetadataValue(mcMMO.p, playerName);
//Fake the profile //Fake the profile
playerProfile = new PlayerProfile(playerName, false);
profile = new PlayerProfile(playerName, false);
pendingCallback = new Callback() { pendingCallback = new Callback() {
@Override
public void done(String playerName, PlayerProfile p) { public void done(String playerName, PlayerProfile p) {
playerProfile = p; profile = p;
party = PartyManager.getPlayerParty(playerName); party = PartyManager.getPlayerParty(playerName);
ptpRecord = new PartyTeleportRecord(); ptpRecord = new PartyTeleportRecord();
@ -123,22 +128,28 @@ public class McMMOPlayer {
for (SkillType skillType : SkillType.values()) { for (SkillType skillType : SkillType.values()) {
skillManagers.put(skillType, skillType.getManagerClass().getConstructor(McMMOPlayer.class).newInstance(McMMOPlayer.this)); skillManagers.put(skillType, skillType.getManagerClass().getConstructor(McMMOPlayer.class).newInstance(McMMOPlayer.this));
} }
} catch (IllegalAccessException e) { }
catch (IllegalAccessException e) {
mcMMO.p.getPluginLoader().disablePlugin(mcMMO.p); mcMMO.p.getPluginLoader().disablePlugin(mcMMO.p);
e.printStackTrace(); e.printStackTrace();
} catch (IllegalArgumentException e) { }
catch (IllegalArgumentException e) {
mcMMO.p.getPluginLoader().disablePlugin(mcMMO.p); mcMMO.p.getPluginLoader().disablePlugin(mcMMO.p);
e.printStackTrace(); e.printStackTrace();
} catch (InstantiationException e) { }
catch (InstantiationException e) {
mcMMO.p.getPluginLoader().disablePlugin(mcMMO.p); mcMMO.p.getPluginLoader().disablePlugin(mcMMO.p);
e.printStackTrace(); e.printStackTrace();
} catch (NoSuchMethodException e) { }
catch (NoSuchMethodException e) {
mcMMO.p.getPluginLoader().disablePlugin(mcMMO.p); mcMMO.p.getPluginLoader().disablePlugin(mcMMO.p);
e.printStackTrace(); e.printStackTrace();
} catch (SecurityException e) { }
catch (SecurityException e) {
mcMMO.p.getPluginLoader().disablePlugin(mcMMO.p); mcMMO.p.getPluginLoader().disablePlugin(mcMMO.p);
e.printStackTrace(); e.printStackTrace();
} catch (InvocationTargetException e) { }
catch (InvocationTargetException e) {
mcMMO.p.getPluginLoader().disablePlugin(mcMMO.p); mcMMO.p.getPluginLoader().disablePlugin(mcMMO.p);
e.printStackTrace(); e.printStackTrace();
} }
@ -152,7 +163,7 @@ public class McMMOPlayer {
toolMode.put(toolType, false); toolMode.put(toolType, false);
} }
if (!playerProfile.isLoaded()) { if (!profile.isLoaded()) {
mcMMO.p.getLogger().log(Level.WARNING, "Unable to load the PlayerProfile for {0}. Will retry over the next several seconds.", playerName); mcMMO.p.getLogger().log(Level.WARNING, "Unable to load the PlayerProfile for {0}. Will retry over the next several seconds.", playerName);
new RetryProfileLoadingTask().runTaskTimerAsynchronously(mcMMO.p, 11L, 31L); new RetryProfileLoadingTask().runTaskTimerAsynchronously(mcMMO.p, 11L, 31L);
} }
@ -221,7 +232,7 @@ public class McMMOPlayer {
// No database access permitted // No database access permitted
@Override @Override
public void run() { public void run() {
McMMOPlayer.this.playerProfile = profile; McMMOPlayer.this.profile = profile;
} }
} }
@ -585,7 +596,7 @@ public class McMMOPlayer {
break; break;
} }
xpRemoved += playerProfile.levelUp(skillType); xpRemoved += profile.levelUp(skillType);
levelsGained++; levelsGained++;
} }
@ -609,7 +620,7 @@ public class McMMOPlayer {
} }
public PlayerProfile getProfile() { public PlayerProfile getProfile() {
return playerProfile; return profile;
} }
/* /*
@ -835,7 +846,7 @@ public class McMMOPlayer {
SkillUtils.sendSkillMessage(player, ability.getAbilityPlayer(player)); SkillUtils.sendSkillMessage(player, ability.getAbilityPlayer(player));
// Enable the ability // Enable the ability
playerProfile.setAbilityDATS(ability, System.currentTimeMillis() + (ticks * Misc.TIME_CONVERSION_FACTOR)); profile.setAbilityDATS(ability, System.currentTimeMillis() + (ticks * Misc.TIME_CONVERSION_FACTOR));
setAbilityMode(ability, true); setAbilityMode(ability, true);
if (ability == AbilityType.SUPER_BREAKER || ability == AbilityType.GIGA_DRILL_BREAKER) { if (ability == AbilityType.SUPER_BREAKER || ability == AbilityType.GIGA_DRILL_BREAKER) {
@ -900,7 +911,7 @@ public class McMMOPlayer {
* @return the number of seconds remaining before the cooldown expires * @return the number of seconds remaining before the cooldown expires
*/ */
public int calculateTimeRemaining(AbilityType ability) { public int calculateTimeRemaining(AbilityType ability) {
long deactivatedTimestamp = playerProfile.getAbilityDATS(ability) * Misc.TIME_CONVERSION_FACTOR; long deactivatedTimestamp = profile.getAbilityDATS(ability) * Misc.TIME_CONVERSION_FACTOR;
return (int) (((deactivatedTimestamp + (PerksUtils.handleCooldownPerks(player, ability.getCooldown()) * Misc.TIME_CONVERSION_FACTOR)) - System.currentTimeMillis()) / Misc.TIME_CONVERSION_FACTOR); return (int) (((deactivatedTimestamp + (PerksUtils.handleCooldownPerks(player, ability.getCooldown()) * Misc.TIME_CONVERSION_FACTOR)) - System.currentTimeMillis()) / Misc.TIME_CONVERSION_FACTOR);
} }
@ -912,47 +923,47 @@ public class McMMOPlayer {
* These functions are wrapped from PlayerProfile so that we don't always have to store it alongside the McMMOPlayer object. * These functions are wrapped from PlayerProfile so that we don't always have to store it alongside the McMMOPlayer object.
*/ */
public int getSkillLevel(SkillType skill) { public int getSkillLevel(SkillType skill) {
return playerProfile.getSkillLevel(skill); return profile.getSkillLevel(skill);
} }
public float getSkillXpLevelRaw(SkillType skill) { public float getSkillXpLevelRaw(SkillType skill) {
return playerProfile.getSkillXpLevelRaw(skill); return profile.getSkillXpLevelRaw(skill);
} }
public int getSkillXpLevel(SkillType skill) { public int getSkillXpLevel(SkillType skill) {
return playerProfile.getSkillXpLevel(skill); return profile.getSkillXpLevel(skill);
} }
public void setSkillXpLevel(SkillType skill, float xpLevel) { public void setSkillXpLevel(SkillType skill, float xpLevel) {
playerProfile.setSkillXpLevel(skill, xpLevel); profile.setSkillXpLevel(skill, xpLevel);
} }
public int getXpToLevel(SkillType skill) { public int getXpToLevel(SkillType skill) {
return playerProfile.getXpToLevel(skill); return profile.getXpToLevel(skill);
} }
public void removeXp(SkillType skill, int xp) { public void removeXp(SkillType skill, int xp) {
playerProfile.removeXp(skill, xp); profile.removeXp(skill, xp);
} }
public void modifySkill(SkillType skill, int level) { public void modifySkill(SkillType skill, int level) {
playerProfile.modifySkill(skill, level); profile.modifySkill(skill, level);
} }
public void addLevels(SkillType skill, int levels) { public void addLevels(SkillType skill, int levels) {
playerProfile.addLevels(skill, levels); profile.addLevels(skill, levels);
} }
public void addXp(SkillType skill, float xp) { public void addXp(SkillType skill, float xp) {
playerProfile.addXp(skill, xp); profile.addXp(skill, xp);
} }
public void setAbilityDATS(AbilityType ability, long DATS) { public void setAbilityDATS(AbilityType ability, long DATS) {
playerProfile.setAbilityDATS(ability, DATS); profile.setAbilityDATS(ability, DATS);
} }
public void resetCooldowns() { public void resetCooldowns() {
playerProfile.resetCooldowns(); profile.resetCooldowns();
} }
public FixedMetadataValue getPlayerMetadata() { public FixedMetadataValue getPlayerMetadata() {

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

@ -407,7 +407,7 @@ public class PlayerListener implements Listener {
} }
} }
/**e /**
* Monitor PlayerRespawnEvents. * Monitor PlayerRespawnEvents.
* <p> * <p>
* These events are monitored for the purpose of setting the * These events are monitored for the purpose of setting the

3
src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java
View File

@ -3,10 +3,9 @@ package com.gmail.nossr50.skills.alchemy;
import com.gmail.nossr50.config.AdvancedConfig; import com.gmail.nossr50.config.AdvancedConfig;
import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.runnables.skills.AlchemyBrewTask; import com.gmail.nossr50.runnables.skills.AlchemyBrewTask;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;