From 03ea3b29148c6bbd1f43b1cb785f58134fad079f Mon Sep 17 00:00:00 2001
From: ItsKev <kevin.huber@hotmail.com>
Date: Sun, 4 Jan 2026 19:02:32 +0100
Subject: [PATCH] chore: use published helm chart and update image references

---
 common/src/main/kotlin/gg/grounds/agones/AgonesHelper.kt | 5 +++++
 paper/devspace.yaml                                      | 4 ++--
 velocity/devspace.yaml                                   | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/common/src/main/kotlin/gg/grounds/agones/AgonesHelper.kt b/common/src/main/kotlin/gg/grounds/agones/AgonesHelper.kt
index 65b3f2c..29b49a0 100644
--- a/common/src/main/kotlin/gg/grounds/agones/AgonesHelper.kt
+++ b/common/src/main/kotlin/gg/grounds/agones/AgonesHelper.kt
@@ -1,5 +1,6 @@
 package gg.grounds.agones
 
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
@@ -47,6 +48,8 @@ class AgonesHelper(
         val isInState =
             try {
                 agonesClient.isGameServerInState(desiredState)
+            } catch (error: CancellationException) {
+                throw error
             } catch (error: Throwable) {
                 logger.error("Failed to check Agones GameServer state", error)
                 return
@@ -59,6 +62,8 @@ class AgonesHelper(
         try {
             action()
             logger.info(successMessage)
+        } catch (error: CancellationException) {
+            throw error
         } catch (error: Throwable) {
             logger.error(failureMessage, error)
         }
diff --git a/paper/devspace.yaml b/paper/devspace.yaml
index 72c1c30..cc118b1 100644
--- a/paper/devspace.yaml
+++ b/paper/devspace.yaml
@@ -7,12 +7,12 @@ deployments:
     helm:
       releaseName: plugin-agones-paper
       chart:
-        name: ../../charts/charts/agones
+        name: oci://ghcr.io/groundsgg/charts/agones-fleet
         version: 0.1.0
       values:
         image:
           repository: ghcr.io/groundsgg/paper
-          tag: 0.2.0
+          tag: 0.3.0
         serverType: paper
         command: ["/bin/sh", "-c", "sleep infinity"]
 
diff --git a/velocity/devspace.yaml b/velocity/devspace.yaml
index 18e2ad9..4c4386b 100644
--- a/velocity/devspace.yaml
+++ b/velocity/devspace.yaml
@@ -7,12 +7,12 @@ deployments:
     helm:
       releaseName: plugin-agones-velocity
       chart:
-        name: ../../charts/charts/agones
+        name: oci://ghcr.io/groundsgg/charts/agones-fleet
         version: 0.1.0
       values:
         image:
           repository: ghcr.io/groundsgg/velocity
-          tag: 0.4.0
+          tag: 0.6.0
         serverType: velocity
         command: ["/bin/sh", "-c", "sleep infinity"]