Fix exception on Folia and specify Accept header

Fixes #49
Azuriom · Sep 15, 2024 · 2c93016 · 2c93016
1 parent 5414bdf
commit 2c93016
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 allprojects {
     group 'com.azuriom'
-    version '1.3.6'
+    version '1.3.7'
 }
 
 subprojects {

diff --git a/bukkit/src/main/java/com/azuriom/azlink/bukkit/AzLinkBukkitPlugin.java b/bukkit/src/main/java/com/azuriom/azlink/bukkit/AzLinkBukkitPlugin.java
@@ -157,7 +157,8 @@ public Optional<WorldData> getWorldData() {
                 .mapToInt(w -> w.getLoadedChunks().length)
                 .sum();
 
-        int entities = getServer().getWorlds().stream()
+        // Prevent 'Accessing entity state off owning region's thread' exception on Folia
+        int entities = isFolia() ? 0 : getServer().getWorlds().stream()
                 .mapToInt(w -> w.getEntities().size())
                 .sum();
 
@@ -195,9 +196,8 @@ private boolean isPlayerVisible(Player player) {
         return true;
     }
 
-    @SuppressWarnings("deprecation") // Folia support
     private void scheduleTpsTask() {
-        if (this.scheduler instanceof FoliaSchedulerAdapter) {
+        if (isFolia()) {
             FoliaSchedulerAdapter.scheduleSyncTask(this, this.tpsTask, 1, 1);
 
             return;
@@ -206,7 +206,6 @@ private void scheduleTpsTask() {
         getServer().getScheduler().runTaskTimer(this, this.tpsTask, 1, 1);
     }
 
-    @SuppressWarnings("deprecation") // Folia support
     private SchedulerAdapter createSchedulerAdapter() {
         try {
             Class.forName("io.papermc.paper.threadedregions.scheduler.ScheduledTask");
@@ -219,4 +218,8 @@ private SchedulerAdapter createSchedulerAdapter() {
             );
         }
     }
+
+    private boolean isFolia() {
+        return this.scheduler instanceof FoliaSchedulerAdapter;
+    }
 }
diff --git a/common/src/main/java/com/azuriom/azlink/common/http/client/HttpClient.java b/common/src/main/java/com/azuriom/azlink/common/http/client/HttpClient.java
@@ -144,6 +144,7 @@ private HttpURLConnection prepareConnection(RequestMethod method, String endpoin
         conn.setConnectTimeout(CONNECT_TIMEOUT);
         conn.setReadTimeout(READ_TIMEOUT);
         conn.setRequestMethod(method.name());
+        conn.addRequestProperty("Accept", "application/json");
         conn.addRequestProperty("Azuriom-Link-Token", token);
         conn.addRequestProperty("Content-Type", "application/json; charset=utf-8");
         conn.addRequestProperty("User-Agent", "AzLink java v" + version);