SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-758: Capture head drops from charged creeper kills

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-04-13 11:47:47 +01:00
parent 6bd7443dc3
commit 290b584eb4
4 changed files with 99 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
paper-server/nms-patches/EntityZombie.patch
View File

@@ -1,5 +1,5 @@
--- /home/matt/mc-dev-private//net/minecraft/server/EntityZombie.java 2015-02-26 22:40:22.739608138 +0000
+++ src/main/java/net/minecraft/server/EntityZombie.java 2015-02-26 22:40:22.739608138 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/EntityZombie.java 2015-04-13 11:47:19.167986873 +0100
+++ src/main/java/net/minecraft/server/EntityZombie.java 2015-04-13 11:47:19.167986873 +0100
@@ -4,6 +4,14 @@
import java.util.List;
import java.util.UUID;
@@ -115,3 +115,22 @@
boolean flag = this.bp > 0.0F && this.bq > 0.0F;
this.bp = f;
@@ -520,12 +549,16 @@
}
public void die(DamageSource damagesource) {
- super.die(damagesource);
+ // super.die(damagesource); // CraftBukkit
if (damagesource.getEntity() instanceof EntityCreeper && !(this instanceof EntityPigZombie) && ((EntityCreeper) damagesource.getEntity()).isPowered() && ((EntityCreeper) damagesource.getEntity()).cp()) {
((EntityCreeper) damagesource.getEntity()).cq();
- this.a(new ItemStack(Items.SKULL, 1, 2), 0.0F);
+ // CraftBukkit start
+ // this.a(new ItemStack(Items.SKULL, 1, 2), 0.0F);
+ headDrop = new ItemStack(Items.SKULL, 1, 2);
+ // CraftBukkit end
}
+ super.die(damagesource); // CraftBukkit - moved from above
}
static class SyntheticClass_1 { }