diff options
| author | EvilSeph <evilseph@gmail.com> | 2011-08-15 14:30:27 -0400 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2011-08-15 14:30:27 -0400 |
| commit | 26bd45c2336259d1499b7038ecdeafe34992029b (patch) | |
| tree | 48484eb8a258f01b563341b0cf3feb0b6b7aa19f /src/main/java/org | |
| parent | 8ea590bbcc499cd82ec246d455604692c7b74445 (diff) | |
| download | craftbukkit-26bd45c2336259d1499b7038ecdeafe34992029b.tar craftbukkit-26bd45c2336259d1499b7038ecdeafe34992029b.tar.gz craftbukkit-26bd45c2336259d1499b7038ecdeafe34992029b.tar.lz craftbukkit-26bd45c2336259d1499b7038ecdeafe34992029b.tar.xz craftbukkit-26bd45c2336259d1499b7038ecdeafe34992029b.zip | |
Made suiciding through the /kill command not reliant on pvp being allowed.
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftServer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 5eb2bd53..7bda682d 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")) { |