Update to Minecraft 1.14-pre5

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-23 12:00:00 +10:00
parent 0e98365784
commit a0f2b74c8d
560 changed files with 10642 additions and 10867 deletions

View File

@@ -1,23 +1,6 @@
--- a/net/minecraft/server/EntitySkeletonWither.java
+++ b/net/minecraft/server/EntitySkeletonWither.java
@@ -32,7 +32,7 @@
}
public void die(DamageSource damagesource) {
- super.die(damagesource);
+ // super.die(damagesource); // CraftBukkit
if (damagesource.getEntity() instanceof EntityCreeper) {
EntityCreeper entitycreeper = (EntityCreeper) damagesource.getEntity();
@@ -41,6 +41,7 @@
this.a((IMaterial) Items.WITHER_SKELETON_SKULL);
}
}
+ super.die(damagesource); // CraftBukkit - moved from above
}
@@ -68,7 +69,7 @@
@@ -74,7 +74,7 @@
return false;
} else {
if (entity instanceof EntityLiving) {