Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Gabriele C 2018-11-30 14:47:08 +01:00
parent 92493e826c
commit d89f8e0e66
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -865,6 +865,14 @@
</exclusions> </exclusions>
</dependency> </dependency>
<!-- Required to mock the LuckPerms API-->
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>2.5.7</version>
<scope>test</scope>
</dependency>
<!-- JDBC drivers for datasource integration tests --> <!-- JDBC drivers for datasource integration tests -->
<dependency> <dependency>
<groupId>org.xerial</groupId> <groupId>org.xerial</groupId>

10
src/main/java/fr/xephi/authme/data/limbo/persistence/DistributedFilesPersistenceHandler.java
View File

@ -57,7 +57,7 @@ class DistributedFilesPersistenceHandler implements LimboPersistenceHandler {
@Override @Override
public LimboPlayer getLimboPlayer(Player player) { public LimboPlayer getLimboPlayer(Player player) {
String uuid = PlayerUtils.getUuidOrName(player); String uuid = player.getUniqueId().toString();
File file = getPlayerSegmentFile(uuid); File file = getPlayerSegmentFile(uuid);
Map<String, LimboPlayer> entries = readLimboPlayers(file); Map<String, LimboPlayer> entries = readLimboPlayers(file);
return entries == null ? null : entries.get(uuid); return entries == null ? null : entries.get(uuid);
@ -65,7 +65,7 @@ class DistributedFilesPersistenceHandler implements LimboPersistenceHandler {
@Override @Override
public void saveLimboPlayer(Player player, LimboPlayer limbo) { public void saveLimboPlayer(Player player, LimboPlayer limbo) {
String uuid = PlayerUtils.getUuidOrName(player); String uuid = player.getUniqueId().toString();
File file = getPlayerSegmentFile(uuid); File file = getPlayerSegmentFile(uuid);
Map<String, LimboPlayer> entries = null; Map<String, LimboPlayer> entries = null;
@ -79,17 +79,17 @@ class DistributedFilesPersistenceHandler implements LimboPersistenceHandler {
entries = new HashMap<>(); entries = new HashMap<>();
} }
entries.put(PlayerUtils.getUuidOrName(player), limbo); entries.put(uuid, limbo);
saveEntries(entries, file); saveEntries(entries, file);
} }
@Override @Override
public void removeLimboPlayer(Player player) { public void removeLimboPlayer(Player player) {
String uuid = PlayerUtils.getUuidOrName(player); String uuid = player.getUniqueId().toString();
File file = getPlayerSegmentFile(uuid); File file = getPlayerSegmentFile(uuid);
if (file.exists()) { if (file.exists()) {
Map<String, LimboPlayer> entries = readLimboPlayers(file); Map<String, LimboPlayer> entries = readLimboPlayers(file);
if (entries != null && entries.remove(PlayerUtils.getUuidOrName(player)) != null) { if (entries != null && entries.remove(uuid) != null) {
saveEntries(entries, file); saveEntries(entries, file);
} }
} }

6
src/main/java/fr/xephi/authme/data/limbo/persistence/IndividualFilesPersistenceHandler.java
View File

@ -39,7 +39,7 @@ class IndividualFilesPersistenceHandler implements LimboPersistenceHandler {
@Override @Override
public LimboPlayer getLimboPlayer(Player player) { public LimboPlayer getLimboPlayer(Player player) {
String id = PlayerUtils.getUuidOrName(player); String id = player.getUniqueId().toString();
File file = new File(cacheDir, id + File.separator + "data.json"); File file = new File(cacheDir, id + File.separator + "data.json");
if (!file.exists()) { if (!file.exists()) {
return null; return null;
@ -56,7 +56,7 @@ class IndividualFilesPersistenceHandler implements LimboPersistenceHandler {
@Override @Override
public void saveLimboPlayer(Player player, LimboPlayer limboPlayer) { public void saveLimboPlayer(Player player, LimboPlayer limboPlayer) {
String id = PlayerUtils.getUuidOrName(player); String id = player.getUniqueId().toString();
try { try {
File file = new File(cacheDir, id + File.separator + "data.json"); File file = new File(cacheDir, id + File.separator + "data.json");
Files.createParentDirs(file); Files.createParentDirs(file);
@ -75,7 +75,7 @@ class IndividualFilesPersistenceHandler implements LimboPersistenceHandler {
*/ */
@Override @Override
public void removeLimboPlayer(Player player) { public void removeLimboPlayer(Player player) {
String id = PlayerUtils.getUuidOrName(player); String id = player.getUniqueId().toString();
File file = new File(cacheDir, id); File file = new File(cacheDir, id);
if (file.exists()) { if (file.exists()) {
FileUtils.purgeDirectory(file); FileUtils.purgeDirectory(file);