diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 476e57ad3b..78b18503b7 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -21,9 +21,8 @@ import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.LoggerOutputStream;
 import org.bukkit.craftbukkit.command.ColouredConsoleSender;
 import org.bukkit.craftbukkit.scheduler.CraftScheduler;
-import org.bukkit.event.Event;
-import org.bukkit.event.world.WorldEvent;
-// CraftBukkit end
+import org.bukkit.event.world.WorldSaveEvent;
+
 
 public class MinecraftServer implements Runnable, ICommandListener {
 
@@ -211,7 +210,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
             world.a(true, (IProgressUpdate) null);
             world.r();
 
-            WorldEvent event = new WorldEvent( Event.Type.WORLD_SAVE, world.getWorld() );
+            WorldSaveEvent event = new WorldSaveEvent( world.getWorld() );
             server.getPluginManager().callEvent( event );
         }
 
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1ed2b24f49..aafdb9be23 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2,6 +2,8 @@ package org.bukkit.craftbukkit;
 
 import org.bukkit.command.*;
 import org.bukkit.entity.Player;
+import org.bukkit.event.world.WorldLoadEvent;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -30,8 +32,6 @@ import org.bukkit.plugin.SimplePluginManager;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.bukkit.scheduler.BukkitScheduler;
 import org.bukkit.craftbukkit.scheduler.CraftScheduler;
-import org.bukkit.event.Event.Type;
-import org.bukkit.event.world.WorldEvent;
 
 public final class CraftServer implements Server {
     private final String serverName = "Craftbukkit";
@@ -334,7 +334,7 @@ public final class CraftServer implements Server {
     protected void addWorld(World world) {
         worlds.put(world.getName().toLowerCase(), world);
 
-        pluginManager.callEvent(new WorldEvent(Type.WORLD_LOAD, world));
+        pluginManager.callEvent(new WorldLoadEvent(world));
     }
 
     public Logger getLogger() {