diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index def940e4e1..c316bc214d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -363,6 +363,13 @@ public class CraftWorld implements World {
         return creature;
     }
 
+    @Override
+    public LightningStrike strikeLightning(Location loc) {
+        EntityWeatherStorm lightning = new EntityWeatherStorm(world, loc.getX(), loc.getY(), loc.getZ());
+        world.a(lightning);
+        return new CraftLightningStrike(server, lightning);
+    }
+
     public boolean generateTree(Location loc, TreeType type) {
         return generateTree(loc, type, world);
     }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 058ea0541f..841e4c19d8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -78,7 +78,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
         else if (entity instanceof EntityItem) { return new CraftItem( server, (EntityItem) entity); }
         else if (entity instanceof EntityWeather) {
             if (entity instanceof EntityWeatherStorm) {
-                return new CraftWeatherStorm(server, (EntityWeatherStorm)entity);
+                return new CraftLightningStrike(server, (EntityWeatherStorm)entity);
             } else {
                 return new CraftWeather(server, (EntityWeather)entity);
             }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWeatherStorm.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
similarity index 57%
rename from src/main/java/org/bukkit/craftbukkit/entity/CraftWeatherStorm.java
rename to src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
index aacbb3dabe..d081b7f85e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWeatherStorm.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
@@ -3,10 +3,10 @@ package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityWeatherStorm;
 import org.bukkit.craftbukkit.CraftServer;
-import org.bukkit.entity.WeatherStorm;
+import org.bukkit.entity.LightningStrike;
 
-public class CraftWeatherStorm extends CraftEntity implements WeatherStorm {
-    public CraftWeatherStorm(final CraftServer server, final EntityWeatherStorm entity) {
+public class CraftLightningStrike extends CraftEntity implements LightningStrike {
+    public CraftLightningStrike(final CraftServer server, final EntityWeatherStorm entity) {
         super(server, entity);
     }