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

@@ -5,10 +5,10 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 8f77d232a2ce67f8687946959e28b987f40b4523..f46f532dd5c8eadb6250e0aa6161929c7aaa03e3 100644
index 959e404537c9f6c05b36fc811d3aff3ceb0e6478..f7c6633733460bdfe0a02255f9be5ac385ec915a 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1689,7 +1689,7 @@ public abstract class LivingEntity extends Entity {
@@ -1691,7 +1691,7 @@ public abstract class LivingEntity extends Entity {
boolean flag = false;
if (this.dead && adversary instanceof WitherBoss) { // Paper
@@ -18,7 +18,7 @@ index 8f77d232a2ce67f8687946959e28b987f40b4523..f46f532dd5c8eadb6250e0aa6161929c
BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState();
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 6a0ddb0f337bafa0146e77758759ee5c1c85d5ec..7fa3cd8a7f1005386f68f61cf17e65fb5c9a4958 100644
index f7d588198876082c456adfe8aba8e3150620e2d2..e569ca15ded9dc4f85dd9d6431470be6844ed593 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -658,7 +658,7 @@ public abstract class Mob extends LivingEntity {