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] Fix the dead lagging the server
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 3c8119aa55aa1fcd59e8b0d545d474bd100c674e..3fcc8349d5afda0384e09641007b3731010a2d1d 100644
index 27d95f88ef904402c1277818734310c9e37f9cde..ec4f6a2589999e1f2294f50742ece72236a9c7bd 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1763,6 +1763,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -1769,6 +1769,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
this.yRotO = this.getYRot();
this.xRotO = this.getXRot();
this.setYHeadRot(yaw); // Paper - Update head rotation
@@ -17,10 +17,10 @@ index 3c8119aa55aa1fcd59e8b0d545d474bd100c674e..3fcc8349d5afda0384e09641007b3731
public void absMoveTo(double x, double y, double z) {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 3ccac5096d83e21b19dd610a62f37ba21208dac6..8d2f0a07792d88c8f53c87333d32e67502b4e39f 100644
index 726909f539a72bebacde7547d8dfabff0a2469e1..63561520a1e4ff37b5ba012dfffb01ad052c1b45 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2931,7 +2931,7 @@ public abstract class LivingEntity extends Entity {
@@ -2930,7 +2930,7 @@ public abstract class LivingEntity extends Entity {
}
}