Clear sample players in Velocity ping listener

kennytv · Sep 13, 2024 · 3b9ef8b · 3b9ef8b
1 parent c73e18a
commit 3b9ef8b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
@@ -4,10 +4,12 @@ This file contains update logs for this project. The top may contain a `Unreleas
 ---
 ## Unreleased
 ### Changed
+* The `fallback` field now also null values next to an empty array for disabling the feature
 * Updated language files from [Crowdin](https://crowdin.com/translate/maintenance)
 
 ### Fixed
 * Fixed the maintenance dump command
+* Fixed the original player sample not being cleared in Velocity
 ---
 ## 4.2.1 - May 17th 2024
 ### Changed
@@ -110,7 +112,7 @@ This file contains update logs for this project. The top may contain a `Unreleas
 * Bungee/Velocity: Added language fields to choose custom kickmessages for individual proxied servers
   * See [**HERE**](https://github.com/KennyTV/Maintenance/wiki/Configuration#language-file) for an example setting
 * Added Chinese language file (thanks to Spigot user yeban)
-* Added Italian language file (thanks to @TheViperShow)
+* Added Italian language file
 * Updated Russian language file (thanks to Spigot user En_0t_S)
 * Removed automated config migration from 2.x->3.0
   * See [**HERE**](https://github.com/KennyTV/Maintenance/wiki/Updates#updating-from-2x) on how to do that manually - virtually noone should be using such old versions anymore

diff --git a/universal/build.gradle.kts b/universal/build.gradle.kts
@@ -20,7 +20,7 @@ tasks {
         destinationDirectory.set(rootProject.projectDir.resolve("build/libs"))
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         platforms.forEach { platform ->
-            val shadowJarTask = platform.tasks.named<ShadowJar>("shadowJar").forUseAtConfigurationTime().get()
+            val shadowJarTask = platform.tasks.named<ShadowJar>("shadowJar").get()
             dependsOn(shadowJarTask)
             dependsOn(platform.tasks.withType<Jar>())
             from(zipTree(shadowJarTask.archiveFile))

diff --git a/velocity/src/main/java/eu/kennytv/maintenance/velocity/listener/ProxyPingListener.java b/velocity/src/main/java/eu/kennytv/maintenance/velocity/listener/ProxyPingListener.java
@@ -76,6 +76,7 @@ public void execute(final ProxyPingEvent event) {
             for (int i = 0; i < lines.length; i++) {
                 samplePlayers[i] = new ServerPing.SamplePlayer(lines[i], ZERO_UUID);
             }
+            builder.clearSamplePlayers(); // samplePlayers adds
             builder.samplePlayers(samplePlayers);
         }