Commits
md_5 authored 2ed3e3e6e50
| 17 17 | public class DedicatedServer extends MinecraftServer implements IMinecraftServer { |
| 18 18 | |
| 19 19 | static final Logger LOGGER = LogUtils.getLogger(); |
| 20 20 | |
| 21 21 | @Nullable |
| 22 22 | private final TextFilter textFilterClient; |
| 23 23 | |
| 24 24 | - public DedicatedServer(Thread thread, Convertable.ConversionSession convertable_conversionsession, ResourcePackRepository resourcepackrepository, WorldStem worldstem, DedicatedServerSettings dedicatedserversettings, DataFixer datafixer, Services services, WorldLoadListenerFactory worldloadlistenerfactory) { |
| 25 25 | - super(thread, convertable_conversionsession, resourcepackrepository, worldstem, Proxy.NO_PROXY, datafixer, services, worldloadlistenerfactory); |
| 26 26 | + // CraftBukkit start - Signature changed |
| 27 - | + public DedicatedServer(joptsimple.OptionSet options, WorldLoader.c datapackconfiguration, WorldLoader.a worldLoader, Thread thread, Convertable.ConversionSession convertable_conversionsession, ResourcePackRepository resourcepackrepository, WorldStem worldstem, DedicatedServerSettings dedicatedserversettings, DataFixer datafixer, Services services, WorldLoadListenerFactory worldloadlistenerfactory) { |
| 28 - | + super(options, datapackconfiguration, worldLoader, thread, convertable_conversionsession, resourcepackrepository, worldstem, Proxy.NO_PROXY, datafixer, services, worldloadlistenerfactory); |
| 27 + | + public DedicatedServer(joptsimple.OptionSet options, WorldLoader.a worldLoader, Thread thread, Convertable.ConversionSession convertable_conversionsession, ResourcePackRepository resourcepackrepository, WorldStem worldstem, DedicatedServerSettings dedicatedserversettings, DataFixer datafixer, Services services, WorldLoadListenerFactory worldloadlistenerfactory) { |
| 28 + | + super(options, worldLoader, thread, convertable_conversionsession, resourcepackrepository, worldstem, Proxy.NO_PROXY, datafixer, services, worldloadlistenerfactory); |
| 29 29 | + // CraftBukkit end |
| 30 30 | this.settings = dedicatedserversettings; |
| 31 31 | this.rconConsoleSource = new RemoteControlCommandListener(this); |
| 32 32 | this.textFilterClient = TextFilter.createFromConfig(dedicatedserversettings.getProperties().textFilteringConfig); |
| 33 33 | |
| 34 34 | public boolean initServer() throws IOException { |
| 35 35 | Thread thread = new Thread("Server console handler") { |
| 36 36 | public void run() { |
| 37 37 | - BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8)); |
| 38 38 | + // CraftBukkit start |