OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 15:49:00 +01:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

21
patches/server/Adventure.patch
View file

@ -1177,8 +1177,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
+package io.papermc.paper.adventure.providers; +package io.papermc.paper.adventure.providers;
+ +
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap; +import java.util.HashMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; +import java.util.Map;
+import java.util.UUID;
+import net.kyori.adventure.audience.Audience; +import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.text.event.ClickCallback; +import net.kyori.adventure.text.event.ClickCallback;
+import net.kyori.adventure.text.event.ClickEvent; +import net.kyori.adventure.text.event.ClickEvent;
@ -1186,7 +1187,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+import java.util.Queue; +import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicLong;
+ +
+@SuppressWarnings("UnstableApiUsage") // permitted provider +@SuppressWarnings("UnstableApiUsage") // permitted provider
+public class ClickCallbackProviderImpl implements ClickCallback.Provider { +public class ClickCallbackProviderImpl implements ClickCallback.Provider {
@ -1200,15 +1200,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ public static final class CallbackManager { + public static final class CallbackManager {
+ +
+ private final Long2ObjectMap<StoredCallback> callbacks = new Long2ObjectOpenHashMap<>(); + private final Map<UUID, StoredCallback> callbacks = new HashMap<>();
+ private final Queue<StoredCallback> queue = new ConcurrentLinkedQueue<>(); + private final Queue<StoredCallback> queue = new ConcurrentLinkedQueue<>();
+ private final AtomicLong current = new AtomicLong();
+ +
+ private CallbackManager() { + private CallbackManager() {
+ } + }
+ +
+ public long addCallback(final @NotNull ClickCallback<Audience> callback, final ClickCallback.@NotNull Options options) { + public UUID addCallback(final @NotNull ClickCallback<Audience> callback, final ClickCallback.@NotNull Options options) {
+ final long id = current.getAndIncrement(); + final UUID id = UUID.randomUUID();
+ this.queue.add(new StoredCallback(callback, options, id)); + this.queue.add(new StoredCallback(callback, options, id));
+ return id; + return id;
+ } + }
@ -1226,7 +1225,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ } + }
+ +
+ public void runCallback(final @NotNull Audience audience, final long id) { + public void runCallback(final @NotNull Audience audience, final UUID id) {
+ final StoredCallback callback = this.callbacks.get(id); + final StoredCallback callback = this.callbacks.get(id);
+ if (callback != null && callback.valid()) { //TODO Message if expired/invalid? + if (callback != null && callback.valid()) { //TODO Message if expired/invalid?
+ callback.takeUse(); + callback.takeUse();
@ -1239,10 +1238,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ private final long startedAt = System.nanoTime(); + private final long startedAt = System.nanoTime();
+ private final ClickCallback<Audience> callback; + private final ClickCallback<Audience> callback;
+ private final long lifetime; + private final long lifetime;
+ private final long id; + private final UUID id;
+ private int remainingUses; + private int remainingUses;
+ +
+ private StoredCallback(final @NotNull ClickCallback<Audience> callback, final ClickCallback.@NotNull Options options, final long id) { + private StoredCallback(final @NotNull ClickCallback<Audience> callback, final ClickCallback.@NotNull Options options, final UUID id) {
+ this.callback = callback; + this.callback = callback;
+ this.lifetime = options.lifetime().toNanos(); + this.lifetime = options.lifetime().toNanos();
+ this.remainingUses = options.uses(); + this.remainingUses = options.uses();
@ -1267,7 +1266,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return hasRemainingUses() && !expired(); + return hasRemainingUses() && !expired();
+ } + }
+ +
+ public long id() { + public UUID id() {
+ return this.id; + return this.id;
+ } + }
+ } + }

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