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

Update to Minecraft 1.16.4

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-11-03 07:00:00 +11:00
parent 964cc7554a
commit 6450eb0ab7
34 changed files with 374 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
paper-server/nms-patches/EntityLiving.patch
View File

@@ -60,7 +60,7 @@
+ this.datawatcher.set(EntityLiving.HEALTH, (float) this.getAttributeInstance(GenericAttributes.MAX_HEALTH).getValue());
this.i = true;
this.az = (float) ((Math.random() + 1.0D) * 0.009999999776482582D);
this.ae();
this.af();
@@ -184,7 +222,13 @@
double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
int i = (int) (150.0D * d1);
@@ -78,7 +78,7 @@
@@ -406,7 +450,7 @@
protected void cT() {
protected void cU() {
++this.deathTicks;
- if (this.deathTicks == 20) {
+ if (this.deathTicks >= 20 && !this.dead) { // CraftBukkit - (this.deathTicks == 20) -> (this.deathTicks >= 20 && !this.dead)
@@ -345,7 +345,7 @@
return false;
} else if (this.world.isClientSide) {
return false;
- } else if (this.dk()) {
- } else if (this.dl()) {
+ } else if (this.dead || this.killed || this.getHealth() <= 0.0F) { // CraftBukkit - Don't allow entities that got set to dead/killed elsewhere to get damaged and die
return false;
} else if (damagesource.isFire() && this.hasEffect(MobEffects.FIRE_RESISTANCE)) {
@@ -476,7 +476,7 @@
boolean flag = this.lastDamageByPlayerTime > 0;
+ this.dropInventory(); // CraftBukkit - from below
if (this.cV() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
if (this.cW() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
this.a(damagesource, flag);
this.dropDeathLoot(damagesource, i, flag);
}
@@ -757,7 +757,7 @@
+ }
+ // CraftBukkit end
+
public final int dy() {
public final int dz() {
return (Integer) this.datawatcher.get(EntityLiving.bi);
}
@@ -1816,6 +2223,7 @@