8557621c02
- Introduce configurable storage mechanism - LimboPersistence wraps a LimboPersistenceHandler, of which there are multiple implementations - Outside of the limbo.persistence package, classes only talk to LimboPersistence - Restore the way of persisting to JSON from 5.2 (SeparateFilePersistenceHandler) - Add handling for stored limbo players - Merge any existing LimboPlayers together with the goal of only keeping one version of a LimboPlayer: there is no way for a player to be online without triggering the creation of a LimboPlayer first, so we can guarantee that the in-memory LimboPlayer is the most up-to-date, i.e. when restoring limbo data we don't have to check against the disk. - Create and delete LimboPlayers at the same time when LimboPlayers are added or removed from the in-memory map - Catch all exceptions in LimboPersistence so a handler throwing an unexpected exception does not stop the limbo process (#1070) - Extend debug command /authme debug limbo to show LimboPlayer information on disk, too
68 lines
3.0 KiB
Java
68 lines
3.0 KiB
Java
package fr.xephi.authme.settings.properties;
|
|
|
|
import ch.jalu.configme.Comment;
|
|
import ch.jalu.configme.SectionComments;
|
|
import ch.jalu.configme.SettingsHolder;
|
|
import ch.jalu.configme.properties.Property;
|
|
import com.google.common.collect.ImmutableMap;
|
|
import fr.xephi.authme.data.limbo.AllowFlightRestoreType;
|
|
import fr.xephi.authme.data.limbo.WalkFlySpeedRestoreType;
|
|
import fr.xephi.authme.data.limbo.persistence.LimboPersistenceType;
|
|
|
|
import java.util.Map;
|
|
|
|
import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
|
|
|
|
/**
|
|
* Settings for the LimboPlayer feature.
|
|
*/
|
|
public final class LimboSettings implements SettingsHolder {
|
|
|
|
@Comment({
|
|
"Besides storing the data in memory, you can define if/how the data should be persisted",
|
|
"on disk. This is useful in case of a server crash, so next time the server starts we can",
|
|
"properly restore things like OP status, ability to fly, and walk/fly speed.",
|
|
"DISABLED: no disk storage, INDIVIDUAL_FILES: each player data in its own file"
|
|
})
|
|
public static final Property<LimboPersistenceType> LIMBO_PERSISTENCE_TYPE =
|
|
newProperty(LimboPersistenceType.class, "limbo.persistence", LimboPersistenceType.INDIVIDUAL_FILES);
|
|
|
|
@Comment({
|
|
"Whether the player is allowed to fly: RESTORE, ENABLE, DISABLE.",
|
|
"RESTORE sets back the old property from the player."
|
|
})
|
|
public static final Property<AllowFlightRestoreType> RESTORE_ALLOW_FLIGHT =
|
|
newProperty(AllowFlightRestoreType.class, "limbo.restoreAllowFlight", AllowFlightRestoreType.RESTORE);
|
|
|
|
@Comment({
|
|
"Restore fly speed: RESTORE, DEFAULT, MAX_RESTORE, RESTORE_NO_ZERO.",
|
|
"RESTORE: restore the speed the player had;",
|
|
"DEFAULT: always set to default speed;",
|
|
"MAX_RESTORE: take the maximum of the player's current speed and the previous one",
|
|
"RESTORE_NO_ZERO: Like 'restore' but sets speed to default if the player's speed was 0"
|
|
})
|
|
public static final Property<WalkFlySpeedRestoreType> RESTORE_FLY_SPEED =
|
|
newProperty(WalkFlySpeedRestoreType.class, "limbo.restoreFlySpeed", WalkFlySpeedRestoreType.MAX_RESTORE);
|
|
|
|
@Comment({
|
|
"Restore walk speed: RESTORE, DEFAULT, MAX_RESTORE, RESTORE_NO_ZERO.",
|
|
"See above for a description of the values."
|
|
})
|
|
public static final Property<WalkFlySpeedRestoreType> RESTORE_WALK_SPEED =
|
|
newProperty(WalkFlySpeedRestoreType.class, "limbo.restoreWalkSpeed", WalkFlySpeedRestoreType.MAX_RESTORE);
|
|
|
|
private LimboSettings() {
|
|
}
|
|
|
|
@SectionComments
|
|
public static Map<String, String[]> createSectionComments() {
|
|
String[] limboExplanation = {
|
|
"Before a user logs in, various properties are temporarily removed from the player,",
|
|
"such as OP status, ability to fly, and walk/fly speed.",
|
|
"Once the user is logged in, we add back the properties we previously saved.",
|
|
"In this section, you may define how these properties should be handled."
|
|
};
|
|
return ImmutableMap.of("limbo", limboExplanation);
|
|
}
|
|
}
|