Skip to content

GH-1328 Fix name update handling. #1328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vLuckyyy wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −9
Open

GH-1328 Fix name update handling. #1328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions eternalcore-core/src/main/java/com/eternalcode/core/user/UserManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,16 @@ public CompletableFuture<User> findOrCreate(UUID uniqueId, String name) {
User cached = this.usersByUniqueId.get(uniqueId);

if (cached != null) {
this.updateNameIfChanged(cached, name);
return CompletableFuture.completedFuture(this.updateLastSeen(cached));
User updatedUser = this.updateNameIfChanged(cached, name);
return CompletableFuture.completedFuture(this.updateLastSeen(updatedUser));
}

return this.userRepository.getUser(uniqueId)
.thenApply(optionalUser -> {
User user = optionalUser
.map(existing -> {
this.updateNameIfChanged(existing, name);
return this.updateLastSeen(existing);
User updatedUser = this.updateNameIfChanged(existing, name);
return this.updateLastSeen(updatedUser);
})
.orElseGet(() -> this.createNewUser(uniqueId, name));

Expand All @@ -59,12 +59,16 @@ private User createNewUser(UUID uniqueId, String name) {
return user;
}

private void updateNameIfChanged(User user, String name) {
if (!user.getName().equals(name)) {
User updated = new User(user.getUniqueId(), name, user.getLastSeen(), user.getAccountCreated());
this.add(updated);
this.userRepository.saveUser(updated);
private User updateNameIfChanged(User user, String name) {
if (user.getName().equals(name)) {
return user;
}

User updated = new User(user.getUniqueId(), name, user.getLastSeen(), user.getAccountCreated());
this.removeNameMapping(user);
this.add(updated);
this.userRepository.saveUser(updated);
return updated;
}

private User updateLastSeen(User user) {
Expand All @@ -74,6 +78,10 @@ private User updateLastSeen(User user) {
return updated;
}

private void removeNameMapping(User user) {
this.usersByName.remove(user.getName(), user);
}

private void add(User user) {
this.usersByUniqueId.put(user.getUniqueId(), user);
this.usersByName.put(user.getName(), user);
Expand Down