diff --git a/build.gradle b/build.gradle
index e1b8cf1ec..737dc73f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,6 +36,8 @@ plugins {
     id 'signing'
 }
 
+compileJava.options.encoding = "UTF-8"
+compileTestJava.options.encoding = "UTF-8"
 
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
@@ -214,6 +216,7 @@ signing {
 }
 
 javadoc {
+    options.encoding = 'UTF-8'
     if(JavaVersion.current().isJava9Compatible()) {
         options.addBooleanOption('html5', true)
     }
diff --git a/src/main/java/emu/grasscutter/server/dispatch/ClientLogHandler.java b/src/main/java/emu/grasscutter/server/dispatch/ClientLogHandler.java
index 4b57826ea..b3d48dbbb 100644
--- a/src/main/java/emu/grasscutter/server/dispatch/ClientLogHandler.java
+++ b/src/main/java/emu/grasscutter/server/dispatch/ClientLogHandler.java
@@ -7,7 +7,7 @@ import express.http.Response;
 import java.io.IOException;
 
 /**
- * Used for processing crash dumps & logs generated by the game.
+ * Used for processing crash dumps and logs generated by the game.
  * Logs are in JSON, and are sent to the server for logging.
  */
 public final class ClientLogHandler implements HttpContextHandler {