Let proxy control when backend removes from waiting

Author: SamB440

spigot/src/main/java/com/convallyria/forcepack/spigot/event/MultiVersionResourcePackStatusEvent.java

@@ -21,13 +21,15 @@ public class MultiVersionResourcePackStatusEvent extends Event {
     private final UUID id;
     private final ResourcePackStatus status;
     private final boolean proxy;
+    private final boolean proxyRemove;
 
-    public MultiVersionResourcePackStatusEvent(@NotNull final Player who, @NotNull UUID id, @NotNull ResourcePackStatus resourcePackStatus, boolean proxy) {
+    public MultiVersionResourcePackStatusEvent(@NotNull final Player who, @NotNull UUID id, @NotNull ResourcePackStatus resourcePackStatus, boolean proxy, boolean proxyRemove) {
         super(true);
         this.player = who;
         this.id = id;
         this.status = resourcePackStatus;
         this.proxy = proxy;
+        this.proxyRemove = proxyRemove;
     }
 
     /**
@@ -65,6 +67,14 @@ public boolean isProxy() {
         return proxy;
     }
 
+    /**
+     * Gets whether the proxy has indicated the player is no longer waiting.
+     * @return whether the proxy has requested the removal of the player from waiting
+     */
+    public boolean isProxyRemove() {
+        return proxyRemove;
+    }
+
     @NotNull
     @Override
     public HandlerList getHandlers() {

spigot/src/main/java/com/convallyria/forcepack/spigot/listener/PacketListener.java

@@ -32,7 +32,7 @@ public void onPacketReceive(PacketReceiveEvent event) {
             final Player player = (Player) event.getPlayer();
             final WrapperPlayClientResourcePackStatus.Result result = status.getResult();
             final UUID packId = status.getPackId();
-            Bukkit.getPluginManager().callEvent(new MultiVersionResourcePackStatusEvent(player, packId, ResourcePackStatus.valueOf(result.name()), false));
+            Bukkit.getPluginManager().callEvent(new MultiVersionResourcePackStatusEvent(player, packId, ResourcePackStatus.valueOf(result.name()), false, false));
         }
     }
 }

spigot/src/main/java/com/convallyria/forcepack/spigot/listener/ResourcePackListener.java

@@ -63,7 +63,13 @@ public void onStatus(MultiVersionResourcePackStatusEvent event) {
         // Only remove from waiting if they actually loaded the resource pack, rather than any status
         // Declined/failed is valid and should be allowed, server owner decides whether they get kicked
         if (status != ResourcePackStatus.ACCEPTED && status != ResourcePackStatus.DOWNLOADED) {
-            plugin.processWaitingResourcePack(player, id);
+            if (event.isProxy()) {
+                if (event.isProxyRemove()) {
+                    plugin.removeFromWaiting(player);
+                }
+            } else {
+                plugin.processWaitingResourcePack(player, id);
+            }
         }
 
         for (String cmd : getConfig().getStringList("Server.Actions." + status.name() + ".Commands")) {

spigot/src/main/java/com/convallyria/forcepack/spigot/listener/VelocityMessageListener.java

@@ -32,6 +32,6 @@ public void onPluginMessageReceived(String channel, Player player, byte[] messag
         plugin.log("Posted event");
 
         final PlayerResourcePackStatusEvent.Status status = PlayerResourcePackStatusEvent.Status.valueOf(split[1]);
-        plugin.getScheduler().executeAsync(() -> Bukkit.getPluginManager().callEvent(new MultiVersionResourcePackStatusEvent(player, UUID.fromString(split[0]), ResourcePackStatus.valueOf(status.name()), true)));
+        plugin.getScheduler().executeAsync(() -> Bukkit.getPluginManager().callEvent(new MultiVersionResourcePackStatusEvent(player, UUID.fromString(split[0]), ResourcePackStatus.valueOf(status.name()), true, Boolean.parseBoolean(split[2]))));
     }
 }

velocity/src/main/java/com/convallyria/forcepack/velocity/listener/ResourcePackListener.java

@@ -110,9 +110,9 @@ public void onPackStatus(PlayerResourcePackStatusEvent event) {
         if (status != PlayerResourcePackStatusEvent.Status.ACCEPTED && status != PlayerResourcePackStatusEvent.Status.DOWNLOADED && !kick) {
             plugin.log("Sent player '%s' plugin message downstream to '%s' for status '%s'", player.getUsername(), currentServer.get().getServerInfo().getName(), status.name());
             // No longer applying, remove them from the list
-            final String name = status == PlayerResourcePackStatusEvent.Status.SUCCESSFUL ? "SUCCESSFULLY_LOADED" : status.name();
-            currentServer.get().sendPluginMessage(PackHandler.FORCEPACK_STATUS_IDENTIFIER, (packByServer.getUUID().toString() + ";" + name).getBytes(StandardCharsets.UTF_8));
             plugin.getPackHandler().processWaitingResourcePack(player, packByServer.getUUID());
+            final String name = status == PlayerResourcePackStatusEvent.Status.SUCCESSFUL ? "SUCCESSFULLY_LOADED" : status.name();
+            currentServer.get().sendPluginMessage(PackHandler.FORCEPACK_STATUS_IDENTIFIER, (packByServer.getUUID().toString() + ";" + name + ";" + !plugin.getPackHandler().isWaiting(player)).getBytes(StandardCharsets.UTF_8));
         }
 
         if (status != PlayerResourcePackStatusEvent.Status.ACCEPTED) sentAccept.remove(player.getUniqueId());