From cd12f057a75868ca3eb131413494c2ee0e182497 Mon Sep 17 00:00:00 2001
From: EvilSeph <evilseph@unaligned.org>
Date: Fri, 10 Jun 2011 20:37:33 -0400
Subject: [PATCH] Fixed cancelled lighting strikes dealing damage.

---
 .../java/net/minecraft/server/WorldServer.java    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index dbc2530869..4548d90b6f 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -130,14 +130,15 @@ public class WorldServer extends World implements BlockChangeDelegate {
     }
 
     public boolean a(Entity entity) {
-        if (super.a(entity)) {
-            // CraftBukkit start
-            LightningStrikeEvent lightning = new LightningStrikeEvent((org.bukkit.World) world, (org.bukkit.entity.LightningStrike) entity.getBukkitEntity());
-            this.cserver.getPluginManager().callEvent(lightning);
+        // CraftBukkit start
+        LightningStrikeEvent lightning = new LightningStrikeEvent((org.bukkit.World) world, (org.bukkit.entity.LightningStrike) entity.getBukkitEntity());
+        this.cserver.getPluginManager().callEvent(lightning);
 
-            if (lightning.isCancelled()) {
-                return false;
-            }
+        if (lightning.isCancelled()) {
+            return false;
+        }
+
+        if (super.a(entity)) {
             this.server.serverConfigurationManager.a(entity.locX, entity.locY, entity.locZ, 512.0D, this.dimension, new Packet71Weather(entity));
             // CraftBukkit end
             return true;