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

16
paper-server/nms-patches/EntityCreeper.patch
View File

@@ -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;