Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@36ce000 Fix xp reward for baby zombies (#7353)
PaperMC/Paper@5c74af2 Fix NPE for bucket empty result stack being null (#7354)
This commit is contained in:
BillyGalbreath
2022-01-16 16:45:56 -06:00
parent 84028e28a5
commit 6b6cd23d7e
6 changed files with 21 additions and 21 deletions

View File

@@ -257,7 +257,7 @@ index 05eba1970086a42b3609094a3d59119c9d178e74..6ba79e10631ffd213d69c55293ec1da6
public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; }
// Paper end
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
index 493f3fe736cef11531d345b076ca240b5feb6ff2..735ecd9d768b9e579142810d5f03093dafad0fa3 100644
index e4ead1ced18f16715440c8562a89d7d359add98e..9a4806baab135128f30ad9be4369bbe1e543c6df 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
@@ -93,11 +93,12 @@ public class Zombie extends Monster {
@@ -274,7 +274,7 @@ index 493f3fe736cef11531d345b076ca240b5feb6ff2..735ecd9d768b9e579142810d5f03093d
}
public Zombie(Level world) {
@@ -284,30 +285,7 @@ public class Zombie extends Monster {
@@ -289,30 +290,7 @@ public class Zombie extends Monster {
@Override
public void aiStep() {
@@ -306,7 +306,7 @@ index 493f3fe736cef11531d345b076ca240b5feb6ff2..735ecd9d768b9e579142810d5f03093d
super.aiStep();
}
@@ -345,6 +323,7 @@ public class Zombie extends Monster {
@@ -350,6 +328,7 @@ public class Zombie extends Monster {
}
@@ -314,7 +314,7 @@ index 493f3fe736cef11531d345b076ca240b5feb6ff2..735ecd9d768b9e579142810d5f03093d
public boolean isSunSensitive() {
return this.shouldBurnInDay; // Paper - use api value instead
}
@@ -474,7 +453,7 @@ public class Zombie extends Monster {
@@ -479,7 +458,7 @@ public class Zombie extends Monster {
nbt.putBoolean("CanBreakDoors", this.canBreakDoors());
nbt.putInt("InWaterTime", this.isInWater() ? this.inWaterTime : -1);
nbt.putInt("DrownedConversionTime", this.isUnderWaterConverting() ? this.conversionTime : -1);
@@ -323,7 +323,7 @@ index 493f3fe736cef11531d345b076ca240b5feb6ff2..735ecd9d768b9e579142810d5f03093d
}
@Override
@@ -488,7 +467,7 @@ public class Zombie extends Monster {
@@ -493,7 +472,7 @@ public class Zombie extends Monster {
}
// Paper start
if (nbt.contains("Paper.ShouldBurnInDay")) {