twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-07-30 19:52:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use random UUIDs instead of incrementing long for click callback ids (#9007)

Browse Source
This commit is contained in:
Jason Penilla
2023-03-19 11:25:45 -07:00
parent 5f6566b549
commit d8a4261a4d
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/Paper-command.patch
View File

@@ -298,15 +298,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+import io.papermc.paper.adventure.providers.ClickCallbackProviderImpl;
+import io.papermc.paper.command.PaperSubcommand;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.ClickCallback;
+import net.kyori.adventure.text.event.ClickEvent;
+import java.util.UUID;
+import org.bukkit.command.CommandSender;
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.framework.qual.DefaultQualifier;
+
+import java.time.Duration;
+
+@DefaultQualifier(NonNull.class)
+public final class CallbackCommand implements PaperSubcommand {
+ @Override
@@ -315,10 +311,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return false;
+ }
+
+ final long id;
+ final UUID id;
+ try {
+ id = Long.parseLong(args[0]);
+ } catch (final NumberFormatException ignored) {
+ id = UUID.fromString(args[0]);
+ } catch (final IllegalArgumentException ignored) {
+ return false;
+ }
+