From 00ed2284ecb4fb03bbb97d2b6a62c61ab15cde1a Mon Sep 17 00:00:00 2001
From: Max Lee <max@themoep.de>
Date: Sat, 10 Aug 2024 20:12:19 +0100
Subject: [PATCH] Use the default Minecraft port instead of custom one (#1277)

---
 .../proxy/config/VelocityConfiguration.java               | 8 ++++----
 proxy/src/main/resources/default-velocity.toml            | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java b/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
index 11c65d5270..9c2e1e8280 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/config/VelocityConfiguration.java
@@ -60,7 +60,7 @@ public class VelocityConfiguration implements ProxyConfig {
   private static final Logger logger = LogManager.getLogger(VelocityConfiguration.class);
 
   @Expose
-  private String bind = "0.0.0.0:25577";
+  private String bind = "0.0.0.0:25565";
   @Expose
   private String motd = "<aqua>A Velocity Server";
   @Expose
@@ -503,7 +503,7 @@ public static VelocityConfiguration read(Path path) throws IOException {
       final PingPassthroughMode pingPassthroughMode = config.getEnumOrElse("ping-passthrough",
               PingPassthroughMode.DISABLED);
 
-      final String bind = config.getOrElse("bind", "0.0.0.0:25577");
+      final String bind = config.getOrElse("bind", "0.0.0.0:25565");
       final int maxPlayers = config.getIntOrElse("show-max-players", 500);
       final boolean onlineMode = config.getOrElse("online-mode", true);
       final boolean forceKeyAuthentication = config.getOrElse("force-key-authentication", true);
@@ -830,7 +830,7 @@ private static class Query {
     @Expose
     private boolean queryEnabled = false;
     @Expose
-    private int queryPort = 25577;
+    private int queryPort = 25565;
     @Expose
     private String queryMap = "Velocity";
     @Expose
@@ -849,7 +849,7 @@ private Query(boolean queryEnabled, int queryPort, String queryMap, boolean show
     private Query(CommentedConfig config) {
       if (config != null) {
         this.queryEnabled = config.getOrElse("enabled", false);
-        this.queryPort = config.getIntOrElse("port", 25577);
+        this.queryPort = config.getIntOrElse("port", 25565);
         this.queryMap = config.getOrElse("map", "Velocity");
         this.showPlugins = config.getOrElse("show-plugins", false);
       }
diff --git a/proxy/src/main/resources/default-velocity.toml b/proxy/src/main/resources/default-velocity.toml
index 3f4f6318c3..e402305cc1 100644
--- a/proxy/src/main/resources/default-velocity.toml
+++ b/proxy/src/main/resources/default-velocity.toml
@@ -1,8 +1,8 @@
 # Config version. Do not change this
 config-version = "2.7"
 
-# What port should the proxy be bound to? By default, we'll bind to all addresses on port 25577.
-bind = "0.0.0.0:25577"
+# What port should the proxy be bound to? By default, we'll bind to all addresses on port 25565.
+bind = "0.0.0.0:25565"
 
 # What should be the MOTD? This gets displayed when the player adds your server to
 # their server list. Only MiniMessage format is accepted.
@@ -150,7 +150,7 @@ accepts-transfers = false
 enabled = false
 
 # If query is enabled, on what port should the query protocol listen on?
-port = 25577
+port = 25565
 
 # This is the map name that is reported to the query services.
 map = "Velocity"