diff --git a/src/main/java/pw/kaboom/extras/Main.java b/src/main/java/pw/kaboom/extras/Main.java
index 468b33d..72ad49b 100644
--- a/src/main/java/pw/kaboom/extras/Main.java
+++ b/src/main/java/pw/kaboom/extras/Main.java
@@ -120,6 +120,9 @@ public final class Main extends JavaPlugin {
 	@Override
 	public void onDisable() {
 		if (Bukkit.isStopping()) {
+			/* This should never be done in a critical environment, as it can lead to data corruption.
+				We are not too concerned with data corruption, as the server resets daily. In our case, it's
+				more important to ensure that the server never hangs. */
 			Runtime.getRuntime().halt(0);
 		}
 	}
diff --git a/src/main/java/pw/kaboom/extras/modules/server/ServerCommand.java b/src/main/java/pw/kaboom/extras/modules/server/ServerCommand.java
index 6ccd1ca..081b472 100644
--- a/src/main/java/pw/kaboom/extras/modules/server/ServerCommand.java
+++ b/src/main/java/pw/kaboom/extras/modules/server/ServerCommand.java
@@ -111,6 +111,11 @@ public final class ServerCommand implements Listener {
 		} catch (NumberFormatException exception) {
 			// Do nothing
 		}
+
+		if (command.contains("[distance=")) {
+			return command.replace("[distance=", "[");
+		}
+
 		return null;
 	}
 
diff --git a/src/main/java/pw/kaboom/extras/modules/server/ServerPing.java b/src/main/java/pw/kaboom/extras/modules/server/ServerPing.java
index 642a72e..7dfe307 100644
--- a/src/main/java/pw/kaboom/extras/modules/server/ServerPing.java
+++ b/src/main/java/pw/kaboom/extras/modules/server/ServerPing.java
@@ -9,11 +9,11 @@ public final class ServerPing implements Listener {
 	@EventHandler
 	void onServerListPing(final PaperServerListPingEvent event) {
 		if (event.getClient().getProtocolVersion() == -1) {
-			final int protocol = 578;
+			final int protocol = 736;
 			event.setProtocolVersion(protocol);
 		} else {
 			event.setProtocolVersion(event.getClient().getProtocolVersion());
 		}
-		event.setVersion("1.15.2");
+		event.setVersion("1.16.1");
 	}
 }