diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b54a1d4c34..3be4aab1a1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -123,6 +123,9 @@ implements ICommandListener, Runnable {
             }
 
         }
+	
+	a.info("Starting timer event scheduler");
+	server.getScheduler().start();
 
         e();
     }
@@ -147,6 +150,10 @@ implements ICommandListener, Runnable {
 
     private void g() {
         a.info("Stopping server");
+	    
+	a.info("Starting timer event scheduler");
+	server.getScheduler().disable();
+	    
         if (f != null) {
             f.d();
         }
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c3b9c7cdab..14eb19a117 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -21,12 +21,14 @@ public final class CraftServer implements Server {
 
     protected final MinecraftServer console;
     protected final ServerConfigurationManager server;
+    protected CraftScheduler scheduler;
 
     public CraftServer(MinecraftServer console, ServerConfigurationManager server) {
         this.console = console;
         this.server = server;
 
         pluginManager.RegisterInterface(JavaPluginLoader.class);
+	scheduler = new CraftScheduler(this);
     }
     
     public void loadPlugins() {
@@ -118,6 +120,10 @@ public final class CraftServer implements Server {
     public void setTime(long time) {
         console.e.e = time;
     }
+    
+    public CraftScheduler getScheduler() {
+        return scheduler;
+    }
 
     public ServerConfigurationManager getHandle() {
         return server;