diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-04-13 11:47:47 +0100 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-04-13 11:47:47 +0100 |
| commit | 85cf593df9a8f6dbdcbd23401f8c5d65003fa6de (patch) | |
| tree | c294684a9083f00f9805bc73f100c29b71ecb8b8 /nms-patches/EntityCreeper.patch | |
| parent | 889a5eca6e2f9aef1a381f4a93a6b2a8717645c6 (diff) | |
| download | craftbukkit-85cf593df9a8f6dbdcbd23401f8c5d65003fa6de.tar craftbukkit-85cf593df9a8f6dbdcbd23401f8c5d65003fa6de.tar.gz craftbukkit-85cf593df9a8f6dbdcbd23401f8c5d65003fa6de.tar.lz craftbukkit-85cf593df9a8f6dbdcbd23401f8c5d65003fa6de.tar.xz craftbukkit-85cf593df9a8f6dbdcbd23401f8c5d65003fa6de.zip | |
SPIGOT-758: Capture head drops from charged creeper kills
Diffstat (limited to 'nms-patches/EntityCreeper.patch')
| -rw-r--r-- | nms-patches/EntityCreeper.patch | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/nms-patches/EntityCreeper.patch b/nms-patches/EntityCreeper.patch index a359edcb..84d0d8fc 100644 --- a/nms-patches/EntityCreeper.patch +++ b/nms-patches/EntityCreeper.patch @@ -1,5 +1,5 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/EntityCreeper.java 2015-02-26 22:40:22.499608140 +0000 -+++ src/main/java/net/minecraft/server/EntityCreeper.java 2015-02-26 22:40:22.499608140 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/EntityCreeper.java 2015-04-13 11:47:18.827986881 +0100 ++++ src/main/java/net/minecraft/server/EntityCreeper.java 2015-04-13 11:47:18.831986881 +0100 @@ -1,5 +1,10 @@ package net.minecraft.server; @@ -19,7 +19,7 @@ public EntityCreeper(World world) { super(world); -@@ -110,19 +116,36 @@ +@@ -110,19 +116,39 @@ } public void die(DamageSource damagesource) { @@ -37,7 +37,11 @@ + // CraftBukkit end } else if (damagesource.getEntity() instanceof EntityCreeper && damagesource.getEntity() != this && ((EntityCreeper) damagesource.getEntity()).isPowered() && ((EntityCreeper) damagesource.getEntity()).cp()) { ((EntityCreeper) damagesource.getEntity()).cq(); - this.a(new ItemStack(Items.SKULL, 1, 4), 0.0F); +- this.a(new ItemStack(Items.SKULL, 1, 4), 0.0F); ++ // CraftBukkit start ++ // this.a(new ItemStack(Items.SKULL, 1, 4), 0.0F); ++ headDrop = new ItemStack(Items.SKULL, 1, 4); ++ // CraftBukkit end } + + super.die(damagesource); // CraftBukkit - Moved from above @@ -58,7 +62,7 @@ public boolean r(Entity entity) { return true; -@@ -146,7 +169,21 @@ +@@ -146,7 +172,21 @@ public void onLightningStrike(EntityLightning entitylightning) { super.onLightningStrike(entitylightning); @@ -81,7 +85,7 @@ } protected boolean a(EntityHuman entityhuman) { -@@ -170,8 +207,15 @@ +@@ -170,8 +210,15 @@ boolean flag = this.world.getGameRules().getBoolean("mobGriefing"); float f = this.isPowered() ? 2.0F : 1.0F; |