From 1ac1e6aea44467d8f7ff764985bffeec6ab05604 Mon Sep 17 00:00:00 2001
From: Luke <32024335+lukeeey@users.noreply.github.com>
Date: Mon, 15 Dec 2025 17:42:14 +0000
Subject: [PATCH 1/4] Fix hitcount in README

Why does the dwyl hitcount always have issues? i changed it to use hitcount.dev
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9b8e6600..99da6286 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Build Status](https://github.com/GeyserMC/Floodgate/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/GeyserMC/Floodgate/actions/workflows/build.yml?query=branch%3Amaster)
 [![Discord](https://img.shields.io/discord/613163671870242838.svg?color=%237289da&label=discord)](http://discord.geysermc.org/)
-[![HitCount](https://hits.dwyl.com/GeyserMC/Floodgate.svg)](http://hits.dwyl.com/GeyserMC/Floodgate)
+[![Hits](https://hitcount.dev/p/GeyserMC/Floodgate.svg)](https://hitcount.dev/p/GeyserMC/Floodgate)
 
 [Download](https://geysermc.org/download/?project=floodgate)
 

From 65eecbf41a9249de5c4bc78f50ae587d16ee4a66 Mon Sep 17 00:00:00 2001
From: Luke <32024335+lukeeey@users.noreply.github.com>
Date: Mon, 15 Dec 2025 18:08:31 +0000
Subject: [PATCH 2/4] Don't trigger builds when updating certain files such as
 README

---
 .github/workflows/build.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c251f4a7..71bfd845 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,14 @@
 name: Build
 
-on: [push]
+on:
+  workflow_dispatch:
+  push:
+    paths-ignore:
+      - 'LICENSE'
+      - 'README.md'
+      - '.gitignore'
+      - '.idea/copyright/*.xml'
+      - '.github/workflows/pullrequest.yml'
 
 jobs:
   build:

From fb2552282e7044055cc4ab1ac7e429307275eac8 Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Mon, 22 Dec 2025 17:29:03 +0100
Subject: [PATCH 3/4] Thank you Spigot for using Mojang mappings after this
 version :)

---
 .../geysermc/floodgate/util/ClassNames.java   | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java b/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java
index 14072a64..b9662481 100644
--- a/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java
+++ b/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java
@@ -236,10 +236,23 @@ public class ClassNames {
 
             PACKET_LISTENER = getFieldOfType(networkManager, packetListenerClass);
         } else {
-            // We get the field by name on 1.20.2+ as there are now multiple fields of this type in network manager
+            // We get the field by name on 1.20.2+ as there are now multiple fields of this type in network manager.
+            // We need the second one, the packetListener. Not disconnectListener
 
-            // PacketListener packetListener of NetworkManager
-            PACKET_LISTENER = getField(networkManager, "packetListener", "q");
+            // Mojang mapping variant
+            Field packetListener = getField(networkManager, "packetListener");
+
+            if (packetListener == null) {
+                // We're most likely on Spigot between 1.20.2 and 26.1 (because obfuscated names are dropped after)
+                packetListener = getField(networkManager, "q");
+
+                if (Boolean.TYPE.equals(packetListener.getType())) {
+                    // In the last version of obfuscated field names of Spigot (1.21.11), the name changed :/
+                    packetListener = getField(networkManager, "n");
+                }
+            }
+
+            PACKET_LISTENER = packetListener;
             makeAccessible(PACKET_LISTENER);
         }
         checkNotNull(PACKET_LISTENER, "Packet listener");

From a7729114bf00a3f5c6756cd66f9c94e2bfcb8ed0 Mon Sep 17 00:00:00 2001
From: Tim203 <mctim203@gmail.com>
Date: Tue, 23 Dec 2025 00:00:45 +0100
Subject: [PATCH 4/4] Update the websocket library

---
 build-logic/src/main/kotlin/Versions.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-logic/src/main/kotlin/Versions.kt b/build-logic/src/main/kotlin/Versions.kt
index c70e843f..29d5a794 100644
--- a/build-logic/src/main/kotlin/Versions.kt
+++ b/build-logic/src/main/kotlin/Versions.kt
@@ -37,7 +37,7 @@ object Versions {
     const val cloudCore = "2.0.0-rc.2"
     const val bstatsVersion = "3.0.2"
 
-    const val javaWebsocketVersion = "1.5.2"
+    const val javaWebsocketVersion = "1.6.0"
 
     const val checkerQual = "3.19.0"
 }