From 26bd45c2336259d1499b7038ecdeafe34992029b Mon Sep 17 00:00:00 2001
From: EvilSeph <evilseph@gmail.com>
Date: Mon, 15 Aug 2011 14:30:27 -0400
Subject: [PATCH] Made suiciding through the /kill command not reliant on pvp
 being allowed.

---
 src/main/java/org/bukkit/craftbukkit/CraftServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5eb2bd5368..7bda682d21 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -374,7 +374,7 @@ public final class CraftServer implements Server {
                 getPluginManager().callEvent(ede);
                 if (ede.isCancelled()) return true;
 
-                player.damage(ede.getDamage(), player);
+                player.damage(ede.getDamage());
                 return true;
             } else if (commandLine.toLowerCase().startsWith("tell ")) {
                 if (!player.hasPermission("craftbukkit.command.tell")) {