Spigot
Public
Commits
md_5 authored e53686f7e04
| 1 - | From 99aea270b426bfe72da1ee0f0d16025a6b112b25 Mon Sep 17 00:00:00 2001 |
| 1 + | From c999af88dcee33b55d09950ca95f2109c4a214fa Mon Sep 17 00:00:00 2001 |
| 2 2 | From: md_5 <md_5@live.com.au> |
| 3 3 | Date: Sun, 7 Jul 2013 09:32:53 +1000 |
| 4 4 | Subject: [PATCH] Spigot Configuration |
| 5 5 | |
| 6 6 | Provides the basic infrastructure to load and save the Spigot configuration file, spigot.yml |
| 7 7 | |
| 8 8 | diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java |
| 9 9 | index 61fc7c961..3ee110b62 100644 |
| 10 10 | --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java |
| 11 11 | +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java |
| 70 70 | } |
| 71 71 | |
| 72 72 | pluginManager.clearPlugins(); |
| 73 73 | commandMap.clearCommands(); |
| 74 74 | reloadData(); |
| 75 75 | + org.spigotmc.SpigotConfig.registerCommands(); // Spigot |
| 76 76 | overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*"); |
| 77 77 | ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions"); |
| 78 78 | |
| 79 79 | diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java |
| 80 - | index c81d1db03..7c35bbd6c 100644 |
| 80 + | index b899da786..4b142ff88 100644 |
| 81 81 | --- a/src/main/java/org/bukkit/craftbukkit/Main.java |
| 82 82 | +++ b/src/main/java/org/bukkit/craftbukkit/Main.java |
| 83 - | |
| 84 - | acceptsAll(asList("v", "version"), "Show the CraftBukkit Version"); |
| 85 - | |
| 83 + | |
| 86 84 | acceptsAll(asList("demo"), "Demo mode"); |
| 85 + | |
| 86 + | acceptsAll(asList("initSettings"), "Only create configuration files and then exit"); // SPIGOT-5761: Add initSettings option |
| 87 87 | + |
| 88 88 | + // Spigot Start |
| 89 89 | + acceptsAll(asList("S", "spigot-settings"), "File for spigot settings") |
| 90 90 | + .withRequiredArg() |
| 91 91 | + .ofType(File.class) |
| 92 92 | + .defaultsTo(new File("spigot.yml")) |
| 93 93 | + .describedAs("Yml file"); |
| 94 94 | + // Spigot End |
| 95 95 | } |
| 96 96 | }; |