diff options
| author | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-12-11 16:05:27 +0000 |
|---|---|---|
| committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-12-11 16:05:27 +0000 |
| commit | b2af70e5c7b228efb2a7cdb429d5f2a96bf31fa0 (patch) | |
| tree | 11fe06ebfc76ec0c508954dd0adb4ba01a02d0a7 /src | |
| parent | 1fc8092ea69b0eb59a2f01da07eb5e0bd67d5542 (diff) | |
| download | craftbukkit-b2af70e5c7b228efb2a7cdb429d5f2a96bf31fa0.tar craftbukkit-b2af70e5c7b228efb2a7cdb429d5f2a96bf31fa0.tar.gz craftbukkit-b2af70e5c7b228efb2a7cdb429d5f2a96bf31fa0.tar.lz craftbukkit-b2af70e5c7b228efb2a7cdb429d5f2a96bf31fa0.tar.xz craftbukkit-b2af70e5c7b228efb2a7cdb429d5f2a96bf31fa0.zip | |
Implemented getKiller in LivingEntity
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityLiving.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index 40a9f5bc..f4e2414d 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -56,7 +56,7 @@ public abstract class EntityLiving extends Entity { public float aC; public float aD; public float aE; - protected EntityHuman aF = null; + public EntityHuman aF = null; // CraftBukkit - prot to pub - "killer" protected int aG = 0; public int aH = 0; public int aI = 0; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index ee476d04..baf7ee5f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -15,6 +15,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.Arrow; import org.bukkit.entity.Egg; import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; import org.bukkit.entity.Snowball; import org.bukkit.entity.Vehicle; import org.bukkit.util.BlockIterator; @@ -24,6 +25,7 @@ import java.util.HashSet; import java.util.ArrayList; import java.util.Iterator; import net.minecraft.server.DamageSource; +import net.minecraft.server.EntityHuman; import org.bukkit.entity.HumanEntity; public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -223,4 +225,8 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public String toString() { return "CraftLivingEntity{" + "id=" + getEntityId() + '}'; } + + public Player getKiller() { + return getHandle().aF == null ? null : (Player)getHandle().aF.getBukkitEntity(); + } } |