summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2011-07-28 00:58:50 -0400
committerEvilSeph <evilseph@gmail.com>2011-07-28 00:58:50 -0400
commita8df829a8bc2e71664c6f6d631e3a0229a2d24b6 (patch)
tree0cdb2a72cf67f6d9e863697d5b2475884830c14d /src/main/java/net/minecraft/server
parent6b9c7fa678c797fb701b1a28feeb36734abd0de3 (diff)
downloadcraftbukkit-a8df829a8bc2e71664c6f6d631e3a0229a2d24b6.tar
craftbukkit-a8df829a8bc2e71664c6f6d631e3a0229a2d24b6.tar.gz
craftbukkit-a8df829a8bc2e71664c6f6d631e3a0229a2d24b6.tar.lz
craftbukkit-a8df829a8bc2e71664c6f6d631e3a0229a2d24b6.tar.xz
craftbukkit-a8df829a8bc2e71664c6f6d631e3a0229a2d24b6.zip
Made /kill trigger a damage event. Thanks hollic!
Diffstat (limited to 'src/main/java/net/minecraft/server')
-rw-r--r--src/main/java/net/minecraft/server/NetServerHandler.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index 0078dc45..b72a8119 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -725,7 +725,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
a.info(s);
this.minecraftServer.serverConfigurationManager.sendAll(new Packet3Chat(s));
} else if (s.toLowerCase().startsWith("/kill")) {
- this.player.damageEntity((Entity) null, 1000);
+ this.player.damageEntity(this.player, 1000); // CraftBukkit - replace null entity with player entity; TODO: decide if we want damage with a null source to fire an event.
} else if (s.toLowerCase().startsWith("/tell ")) {
String[] astring = s.split(" ");