twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-07 15:42:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

Small fixups

Browse Source
This commit is contained in:
Nassim Jahnke
2024-12-15 12:13:09 +01:00
parent 171fb2ec07
commit 4c723932f6
3 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
paper-server/patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch
View File

@@ -13,25 +13,20 @@
@Nullable
private RconThread rconThread;
public DedicatedServerSettings settings;
@@ -80,19 +_,12 @@
private DebugSampleSubscriptionTracker debugSampleSubscriptionTracker;
@@ -81,6 +_,7 @@
public ServerLinks serverLinks;
- public DedicatedServer(
- Thread serverThread,
- LevelStorageSource.LevelStorageAccess storageSource,
- PackRepository packRepository,
- WorldStem worldStem,
- DedicatedServerSettings settings,
- DataFixer fixerUpper,
- Services services,
- ChunkProgressListenerFactory progressListenerFactory
- ) {
public DedicatedServer(
+ joptsimple.OptionSet options, net.minecraft.server.WorldLoader.DataLoadContext worldLoader, // CraftBukkit - Signature changed
Thread serverThread,
LevelStorageSource.LevelStorageAccess storageSource,
PackRepository packRepository,
@@ -90,9 +_,9 @@
Services services,
ChunkProgressListenerFactory progressListenerFactory
) {
- super(serverThread, storageSource, packRepository, worldStem, Proxy.NO_PROXY, fixerUpper, services, progressListenerFactory);
+ // CraftBukkit start - Signature changed
+ public DedicatedServer(joptsimple.OptionSet options, net.minecraft.server.WorldLoader.DataLoadContext worldLoader, Thread thread, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PackRepository resourcepackrepository, WorldStem worldstem, DedicatedServerSettings settings, DataFixer datafixer, Services services, ChunkProgressListenerFactory worldloadlistenerfactory) {
+ super(options, worldLoader, thread, convertable_conversionsession, resourcepackrepository, worldstem, Proxy.NO_PROXY, datafixer, services, worldloadlistenerfactory);
+ // CraftBukkit end
+ super(options, worldLoader, serverThread, storageSource, packRepository, worldStem, Proxy.NO_PROXY, fixerUpper, services, progressListenerFactory); // CraftBukkit - Signature changed
this.settings = settings;
- this.rconConsoleSource = new RconConsoleSource(this);
+ //this.rconConsoleSource = new RconConsoleSource(this); // CraftBukkit - remove field