From b5569e81bfa25c1c9d387bb0ed2a8eeac2bdee15 Mon Sep 17 00:00:00 2001
From: AlexandreArcil <arcilalexandre@gmail.com>
Date: Sat, 18 Apr 2026 12:52:16 +0200
Subject: [PATCH] fix incompatibility with Compact Machines

---
 .../common/mixin/core/server/MinecraftServerMixin.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mixins/java/org/spongepowered/common/mixin/core/server/MinecraftServerMixin.java b/src/mixins/java/org/spongepowered/common/mixin/core/server/MinecraftServerMixin.java
index ead34c6b1ce..25e3ac3230d 100644
--- a/src/mixins/java/org/spongepowered/common/mixin/core/server/MinecraftServerMixin.java
+++ b/src/mixins/java/org/spongepowered/common/mixin/core/server/MinecraftServerMixin.java
@@ -83,6 +83,7 @@
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -503,11 +504,12 @@ public void setDifficulty(final Difficulty difficulty, final boolean force) {
         return this.impl$serviceProvider;
     }
 
-    @Inject(method = "reloadResources", at = @At(value = "HEAD"))
-    public void impl$reloadResources(final Collection<String> datapacksToLoad, final CallbackInfoReturnable<CompletableFuture<Void>> cir) {
+    @ModifyVariable(method = "reloadResources",  at = @At(value = "HEAD"), ordinal = 0)
+    public Collection<String> impl$reloadResources(final Collection<String> datapacksToLoad) {
         final List<String> reloadablePacks = ((SpongeDataPackManager) this.dataPackManager()).registerPacks();
-        datapacksToLoad.addAll(reloadablePacks);
+        reloadablePacks.addAll(datapacksToLoad);
         this.shadow$getPackRepository().reload();
+        return reloadablePacks;
     }
 
     @Override