Redesign UUID generate strategy

tanyaofei · Aug 3, 2024 · d60177c · d60177c
1 parent 19af3f9
commit d60177c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...er-core/src/main/java/io/github/hello09x/fakeplayer/core/listener/FakeplayerListener.java b/...er-core/src/main/java/io/github/hello09x/fakeplayer/core/listener/FakeplayerListener.java
@@ -9,6 +9,7 @@
 import io.github.hello09x.fakeplayer.core.config.Config;
 import io.github.hello09x.fakeplayer.core.constant.MetadataKeys;
 import io.github.hello09x.fakeplayer.core.manager.FakeplayerManager;
+import io.github.hello09x.fakeplayer.core.repository.FakePlayerProfileRepository;
 import io.github.hello09x.fakeplayer.core.repository.UsedIdRepository;
 import io.github.hello09x.fakeplayer.core.util.InternalAddressGenerator;
 import org.bukkit.Bukkit;
@@ -39,12 +40,14 @@ public class FakeplayerListener implements Listener {
 
     private final FakeplayerManager manager;
     private final UsedIdRepository usedIdRepository;
+    private final FakePlayerProfileRepository profileRepository;
     private final Config config;
 
     @Inject
-    public FakeplayerListener(FakeplayerManager manager, UsedIdRepository usedIdRepository, Config config) {
+    public FakeplayerListener(FakeplayerManager manager, UsedIdRepository usedIdRepository, FakePlayerProfileRepository profileRepository, Config config) {
         this.manager = manager;
         this.usedIdRepository = usedIdRepository;
+        this.profileRepository = profileRepository;
         this.config = config;
     }
 
@@ -59,7 +62,7 @@ public void onLogin(@NotNull PlayerLoginEvent event) {
             return;
         }
 
-        if (usedIdRepository.contains(player.getUniqueId())) {
+        if (usedIdRepository.contains(player.getUniqueId()) || profileRepository.existsByUUID(player.getUniqueId())) {
             event.disallow(PlayerLoginEvent.Result.KICK_OTHER, textOfChildren(
                     translatable("fakeplayer.listener.login.deny-used-uuid", RED),
                     newline(),

diff --git a/.../main/java/io/github/hello09x/fakeplayer/core/repository/FakePlayerProfileRepository.java b/.../main/java/io/github/hello09x/fakeplayer/core/repository/FakePlayerProfileRepository.java
@@ -33,7 +33,7 @@ public void insert(@NotNull String name, @NotNull UUID uuid) {
 
     public boolean existsByUUID(@NotNull UUID uuid) {
         var sql = "SELECT EXISTS(SELECT 1 FROM fake_player_profile WHERE uuid = ?)";
-        return Boolean.TRUE.equals(jdbc.queryForObject(sql, new BooleanRowMapper()));
+        return Boolean.TRUE.equals(jdbc.queryForObject(sql, new BooleanRowMapper(), uuid.toString()));
     }
 
     public @Nullable UUID selectUUIDByName(@NotNull String name) {