mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2025-09-18 21:33:01 +00:00
62 lines
2.8 KiB
Diff
62 lines
2.8 KiB
Diff
From 0c104a0cea092ee8ac6c7d4d0caebf357cec8e30 Mon Sep 17 00:00:00 2001
|
|
From: slide23 <me@slide.ws>
|
|
Date: Fri, 20 Dec 2013 20:15:33 -0600
|
|
Subject: [PATCH] Add Late Bind Option
|
|
|
|
Add late-bind config option to delay binding until loading is done.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
index 3f74c1c1..aac04452 100644
|
|
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
|
|
@@ -178,6 +178,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
|
this.a(MinecraftEncryption.b());
|
|
DedicatedServer.LOGGER.info("Starting Minecraft server on {}:{}", this.getServerIp().isEmpty() ? "*" : this.getServerIp(), this.getPort());
|
|
|
|
+ if (!org.spigotmc.SpigotConfig.lateBind) {
|
|
try {
|
|
this.getServerConnection().a(inetaddress, this.getPort());
|
|
} catch (IOException ioexception) {
|
|
@@ -186,6 +187,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
|
DedicatedServer.LOGGER.warn("Perhaps a server is already running on that port?");
|
|
return false;
|
|
}
|
|
+ }
|
|
|
|
// CraftBukkit start
|
|
// this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up
|
|
@@ -268,6 +270,17 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
|
|
this.remoteConsole = new org.bukkit.craftbukkit.command.CraftRemoteConsoleCommandSender(this.remoteControlCommandListener); // CraftBukkit
|
|
}
|
|
|
|
+ if (org.spigotmc.SpigotConfig.lateBind) {
|
|
+ try {
|
|
+ this.getServerConnection().a(inetaddress, this.getPort());
|
|
+ } catch (IOException ioexception) {
|
|
+ DedicatedServer.LOGGER.warn("**** FAILED TO BIND TO PORT!");
|
|
+ DedicatedServer.LOGGER.warn("The exception was: {}", ioexception.toString());
|
|
+ DedicatedServer.LOGGER.warn("Perhaps a server is already running on that port?");
|
|
+ return false;
|
|
+ }
|
|
+ }
|
|
+
|
|
if (false && this.getMaxTickTime() > 0L) { // Spigot - disable
|
|
Thread thread1 = new Thread(new ThreadWatchdog(this));
|
|
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index a4200e43..33f0e3b8 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -231,4 +231,9 @@ public class SpigotConfig
|
|
System.setProperty( "io.netty.eventLoopThreads", Integer.toString( count ) );
|
|
Bukkit.getLogger().log( Level.INFO, "Using {0} threads for Netty based IO", count );
|
|
}
|
|
+
|
|
+ public static boolean lateBind;
|
|
+ private static void lateBind() {
|
|
+ lateBind = getBoolean( "settings.late-bind", false );
|
|
+ }
|
|
}
|
|
--
|
|
2.20.1
|
|
|