Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@512995c Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)
PaperMC/Paper@0a9602c [ci skip] Fix multiple ItemStack array nullability mistakes (#7055)
This commit is contained in:
BillyGalbreath
2022-01-23 01:01:36 -06:00
parent f134a20b29
commit 455225ecfc
47 changed files with 206 additions and 215 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 66628b9c301da2fee3afe42ed321a2c31fc63d2b..cb825b7edfcee31ba431e5f166ec9008ea9f2060 100644
index 57f742372485be36f6e854c9a113f0fc3d8f2f13..c34ba47e889f348442d37820e9ba575cb6492ef6 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1690,7 +1690,7 @@ public abstract class LivingEntity extends Entity {
@@ -1689,7 +1689,7 @@ public abstract class LivingEntity extends Entity {
boolean flag = false;
if (this.dead && adversary instanceof WitherBoss) { // Paper
@@ -201,10 +201,10 @@ index 6a4f1e85b2d19dee943cd63ccce05fda2a5fb1eb..8f8a5db7231c1ec69ac8b94b16447321
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
index a22ce4c5b5a5a4b138339a645d445e5725a271e5..29efe3092338dfbd6712ddf47fc34595eb0c9552 100644
index 9619f576f83924de5d25be2402137a10790f6f1e..f64f61e189baab82eb93891313106cc2d8edc8d3 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
@@ -322,7 +322,7 @@ public class Evoker extends SpellcasterIllager {
@@ -339,7 +339,7 @@ public class Evoker extends SpellcasterIllager {
return false;
} else if (Evoker.this.tickCount < this.nextAttackTickCount) {
return false;