Fix missing uses of SF executors

AlexProgrammerDE · Feb 15, 2025 · eef10ab · eef10ab
1 parent fbb0ad6
commit eef10ab
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/server/src/main/java/com/soulfiremc/server/SoulFireServer.java b/server/src/main/java/com/soulfiremc/server/SoulFireServer.java
@@ -207,7 +207,7 @@ public SoulFireServer(
     loadInstances();
 
     var rpcServerStart =
-      CompletableFuture.runAsync(
+      scheduler.runAsync(
         () -> {
           try {
             rpcServer.start();

diff --git a/server/src/main/java/com/soulfiremc/server/account/MSBedrockCredentialsAuthService.java b/server/src/main/java/com/soulfiremc/server/account/MSBedrockCredentialsAuthService.java
@@ -45,7 +45,7 @@ public CompletableFuture<MinecraftAccount> login(MSBedrockCredentialsAuthData da
       } catch (Exception e) {
         throw new CompletionException(e);
       }
-    });
+    }, executor);
   }
 
   @Override
@@ -77,7 +77,7 @@ public CompletableFuture<MinecraftAccount> refresh(MinecraftAccount account, SFP
       } catch (Exception e) {
         throw new CompletionException(e);
       }
-    });
+    }, executor);
   }
 
   @Override

diff --git a/server/src/main/java/com/soulfiremc/server/account/MSBedrockDeviceCodeAuthService.java b/server/src/main/java/com/soulfiremc/server/account/MSBedrockDeviceCodeAuthService.java
@@ -45,7 +45,7 @@ public CompletableFuture<MinecraftAccount> login(MSBedrockDeviceCodeAuthData dat
       } catch (Exception e) {
         throw new CompletionException(e);
       }
-    });
+    }, executor);
   }
 
   @Override
@@ -65,7 +65,7 @@ public CompletableFuture<MinecraftAccount> refresh(MinecraftAccount account, SFP
       } catch (Exception e) {
         throw new CompletionException(e);
       }
-    });
+    }, executor);
   }
 
   @Override

diff --git a/server/src/main/java/com/soulfiremc/server/account/MSJavaCredentialsAuthService.java b/server/src/main/java/com/soulfiremc/server/account/MSJavaCredentialsAuthService.java
@@ -45,7 +45,7 @@ public CompletableFuture<MinecraftAccount> login(MSJavaCredentialsAuthData data,
       } catch (Exception e) {
         throw new CompletionException(e);
       }
-    });
+    }, executor);
   }
 
   @Override
@@ -77,7 +77,7 @@ public CompletableFuture<MinecraftAccount> refresh(MinecraftAccount account, SFP
       } catch (Exception e) {
         throw new CompletionException(e);
       }
-    });
+    }, executor);
   }
 
   @Override

diff --git a/server/src/main/java/com/soulfiremc/server/account/MSJavaDeviceCodeAuthService.java b/server/src/main/java/com/soulfiremc/server/account/MSJavaDeviceCodeAuthService.java
@@ -45,7 +45,7 @@ public CompletableFuture<MinecraftAccount> login(MSJavaDeviceCodeAuthData data,
       } catch (Exception e) {
         throw new CompletionException(e);
       }
-    });
+    }, executor);
   }
 
   @Override
@@ -65,7 +65,7 @@ public CompletableFuture<MinecraftAccount> refresh(MinecraftAccount account, SFP
       } catch (Exception e) {
         throw new CompletionException(e);
       }
-    });
+    }, executor);
   }
 
   @Override

diff --git a/server/src/main/java/com/soulfiremc/server/account/MSJavaRefreshTokenAuthService.java b/server/src/main/java/com/soulfiremc/server/account/MSJavaRefreshTokenAuthService.java
@@ -44,7 +44,7 @@ public CompletableFuture<MinecraftAccount> login(MSJavaRefreshTokenAuthData data
       } catch (Exception e) {
         throw new CompletionException(e);
       }
-    });
+    }, executor);
   }
 
   @Override
@@ -64,7 +64,7 @@ public CompletableFuture<MinecraftAccount> refresh(MinecraftAccount account, SFP
       } catch (Exception e) {
         throw new CompletionException(e);
       }
-    });
+    }, executor);
   }
 
   @Override

diff --git a/server/src/main/java/com/soulfiremc/server/util/structs/SFUpdateChecker.java b/server/src/main/java/com/soulfiremc/server/util/structs/SFUpdateChecker.java
@@ -42,14 +42,14 @@ public SFUpdateChecker() {
   }
 
   public static CompletableFuture<SFUpdateChecker> getInstance(SoulFireServer server) {
-    return CompletableFuture.supplyAsync(
+    return server.scheduler().supplyAsync(
       () -> {
         if (instance == null) {
           instance = new SFUpdateChecker();
         }
 
         return instance;
-      }, server.scheduler());
+      });
   }
 
   private static String checkForUpdates() {