Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-28 13:36:16 +01:00
Code Issues Projects Releases Wiki Activity

Implemented startup plugin loading

Browse Source
This commit is contained in:
Dinnerbone 2011-06-22 17:46:12 +01:00
parent ff67eda4c4
commit d647e2098e
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/minecraft/server/MinecraftServer.java
View File

@ -25,6 +25,7 @@ import org.bukkit.craftbukkit.command.ColouredConsoleSender;
import org.bukkit.craftbukkit.scheduler.CraftScheduler; import org.bukkit.craftbukkit.scheduler.CraftScheduler;
import org.bukkit.craftbukkit.util.ServerShutdownThread; import org.bukkit.craftbukkit.util.ServerShutdownThread;
import org.bukkit.event.world.WorldSaveEvent; import org.bukkit.event.world.WorldSaveEvent;
import org.bukkit.plugin.PluginLoadOrder;
// CraftBukkit // CraftBukkit
public class MinecraftServer implements Runnable, ICommandListener { public class MinecraftServer implements Runnable, ICommandListener {
@ -263,7 +264,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
this.i = null; this.i = null;
this.j = 0; this.j = 0;
server.loadPlugins(); // CraftBukkit server.enablePlugins(PluginLoadOrder.POSTWORLD);
} }
void saveChunks() { // CraftBukkit - private -> default void saveChunks() { // CraftBukkit - private -> default

21
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -58,6 +58,7 @@ import org.bukkit.craftbukkit.command.ServerCommandListener;
import org.bukkit.scheduler.BukkitWorker; import org.bukkit.scheduler.BukkitWorker;
import org.bukkit.craftbukkit.scheduler.CraftScheduler; import org.bukkit.craftbukkit.scheduler.CraftScheduler;
import org.bukkit.event.world.WorldInitEvent; import org.bukkit.event.world.WorldInitEvent;
import org.bukkit.plugin.PluginLoadOrder;
import org.bukkit.util.config.Configuration; import org.bukkit.util.config.Configuration;
import org.bukkit.util.config.ConfigurationNode; import org.bukkit.util.config.ConfigurationNode;
@ -87,6 +88,8 @@ public final class CraftServer implements Server {
configuration.load(); configuration.load();
loadConfigDefaults(); loadConfigDefaults();
configuration.save(); configuration.save();
loadPlugins();
enablePlugins(PluginLoadOrder.STARTUP);
} }
private void loadConfigDefaults() { private void loadConfigDefaults() {
@ -110,7 +113,6 @@ public final class CraftServer implements Server {
File pluginFolder = (File) console.options.valueOf("plugins"); File pluginFolder = (File) console.options.valueOf("plugins");
if (pluginFolder.exists()) { if (pluginFolder.exists()) {
try {
Plugin[] plugins = pluginManager.loadPlugins(pluginFolder); Plugin[] plugins = pluginManager.loadPlugins(pluginFolder);
for (Plugin plugin : plugins) { for (Plugin plugin : plugins) {
try { try {
@ -119,12 +121,6 @@ public final class CraftServer implements Server {
Logger.getLogger(CraftServer.class.getName()).log(Level.SEVERE, ex.getMessage() + " initializing " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex); Logger.getLogger(CraftServer.class.getName()).log(Level.SEVERE, ex.getMessage() + " initializing " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
} }
} }
for (Plugin plugin : plugins) {
loadPlugin(plugin);
}
} catch (Throwable ex) {
Logger.getLogger(CraftServer.class.getName()).log(Level.SEVERE, ex.getMessage() + " (Is it up to date?)", ex);
}
} else { } else {
pluginFolder.mkdir(); pluginFolder.mkdir();
} }
@ -132,6 +128,15 @@ public final class CraftServer implements Server {
commandMap.registerServerAliases(); commandMap.registerServerAliases();
} }
public void enablePlugins(PluginLoadOrder type) {
Plugin[] plugins = pluginManager.getPlugins();
for (Plugin plugin : plugins) {
if ((!plugin.isEnabled()) && (plugin.getDescription().getLoad() == type)) {
loadPlugin(plugin);
}
}
}
public void disablePlugins() { public void disablePlugins() {
pluginManager.disablePlugins(); pluginManager.disablePlugins();
} }
@ -349,6 +354,8 @@ public final class CraftServer implements Server {
)); ));
} }
loadPlugins(); loadPlugins();
enablePlugins(PluginLoadOrder.STARTUP);
enablePlugins(PluginLoadOrder.POSTWORLD);
} }
@Override @Override