From 11b114ca162b3ce9e6b266205e5d953efa38d809 Mon Sep 17 00:00:00 2001
From: Dinnerbone <dinnerbone@dinnerbone.com>
Date: Mon, 10 Jan 2011 03:09:41 +0000
Subject: [PATCH] Revert "Bukkit Timers, now with 100% less github-services
 branch."

This reverts commit 7c37a03a092be7e9c3fb242b4cbe4f6644899af6.
---
 src/main/java/net/minecraft/server/MinecraftServer.java | 7 -------
 src/main/java/org/bukkit/craftbukkit/CraftServer.java   | 6 ------
 2 files changed, 13 deletions(-)

diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3be4aab1a1..b54a1d4c34 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -123,9 +123,6 @@ implements ICommandListener, Runnable {
             }
 
         }
-	
-	a.info("Starting timer event scheduler");
-	server.getScheduler().start();
 
         e();
     }
@@ -150,10 +147,6 @@ 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 14eb19a117..c3b9c7cdab 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -21,14 +21,12 @@ 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() {
@@ -120,10 +118,6 @@ 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;