Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2a4aef3 Mark ChatRender#render as ApiStatus.Override
PaperMC/Paper@f5b9e07 Add GameEvent tags (#6439)
PaperMC/Paper@b173c3e Use access transformers for player profile API (#7468)
PaperMC/Paper@286bd1b 1.18 misc performance dev branch (#7368)
PaperMC/Paper@5bb4549 Fix entity armor not showing on death animation (#7355)
This commit is contained in:
BillyGalbreath
2022-02-18 20:06:35 -06:00
parent d0ea018612
commit 5ad7f4bd90
36 changed files with 101 additions and 99 deletions

View File

@@ -29,7 +29,7 @@ index e414f44168a03874910c5ebdb865fe39d91e27b7..7e85785b902a2ef72c09d53f0e24cb2a
// Purpur end
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 6710358370ade90410a836242862cd72703dba95..3f2af5dfa530b0a9e86b707aaec3218d63271c6d 100644
index 951e583826598a19e92d3e2a02ebd0c7536460d1..17eb40a73e3d73e2fd24ec411c0d76ebf9ae6490 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -260,6 +260,7 @@ public abstract class LivingEntity extends Entity {
@@ -60,7 +60,7 @@ index 6710358370ade90410a836242862cd72703dba95..3f2af5dfa530b0a9e86b707aaec3218d
}
// CraftBukkit start
@@ -3427,6 +3434,27 @@ public abstract class LivingEntity extends Entity {
@@ -3436,6 +3443,27 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.DROWN, 1.0F);
}
@@ -89,10 +89,10 @@ index 6710358370ade90410a836242862cd72703dba95..3f2af5dfa530b0a9e86b707aaec3218d
public boolean isSensitiveToWater() {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 7fa3cd8a7f1005386f68f61cf17e65fb5c9a4958..f760e6f20e65154417e694e94018a3f6760d6ed6 100644
index e569ca15ded9dc4f85dd9d6431470be6844ed593..1441619edfe075c176ef8e2606eb6f5251558e6c 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1656,17 +1656,7 @@ public abstract class Mob extends LivingEntity {
@@ -1660,17 +1660,7 @@ public abstract class Mob extends LivingEntity {
}
public boolean isSunBurnTick() {