Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@996d529 Resend entity using the bundle packet (#9853)
PaperMC/Paper@8cf2503 Updated Upstream (Bukkit/CraftBukkit) (#9876)
PaperMC/Paper@2935067 Fix null item in sendEquipmentChange (#9869)
PaperMC/Paper@b3cac04 Fix crash when version_history.json is empty (#9871)
PaperMC/Paper@b1faa5d Fix PotionAPI ignores icon flag (#9864)
PaperMC/Paper@52849f6 Cleanup disable explosion knockback patch (#9858)
PaperMC/Paper@8b1ac39 Fix warden spawn reason from DEFAULT to NATURAL (#8744)
PaperMC/Paper@c6fac38 fix UnsafeValues#loadAdvancement doesn't recalculate position (#9846)
PaperMC/Paper@5bdfb29 Add player idle duration API (#9833)
PaperMC/Paper@a81a384 Implement Velocity VarInt optimizations (#8418)
PaperMC/Paper@415d708 [ci skip] Fix author in last patch
PaperMC/Paper@3e4eaf2 [ci skip] Fix module derp
PaperMC/Paper@5bb30ce Fix entity camera not being reset when cancelling spectating start/stop events (#9883)
PaperMC/Paper@1865625 Fix NPE when no valid world is found on legacy Players (#9885)
This commit is contained in:
granny
2023-10-29 12:39:53 -07:00
parent ff80cf53d5
commit c9aee076fc
27 changed files with 93 additions and 110 deletions

View File

@@ -778,7 +778,7 @@ index d5837c675e033c7277656e026cb98d55b6668038..c3239a2823d152b8de1f760216323936
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 9e561a8e59666f10468ab8fd5a533f63bdc6cf2a..47527f6145a71d56c428b012033bb8b6b086054f 100644
index a5ad9a5bf708f6ed9844c5ac42f07a34f0833e30..38eed0f72cb6247418944fdd0770e4f9bda38f9e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1237,7 +1237,7 @@ public class ServerPlayer extends Player {
@@ -1163,7 +1163,7 @@ index 30365690fb8b0170636e712ccecb267e3ae53e0a..380f93a750c30c1ce0d0050c35eea19e
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index fe35e4d86f7ce0ac12deb50e6d189a27a29c9f47..afa08d6e886ae9056c3ff88bc3b275cd13ec68a7 100644
index 86ea1fe2fec0edcb0ccecb9ddcb296fdbf2c6d88..b42121391e8af3e90f7064bec1687afaf1b78454 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -410,7 +410,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1184,7 +1184,7 @@ index fe35e4d86f7ce0ac12deb50e6d189a27a29c9f47..afa08d6e886ae9056c3ff88bc3b275cd
}
public boolean canSpawnSoulSpeedParticle() {
@@ -3162,10 +3162,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3159,10 +3159,10 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1198,7 +1198,7 @@ index fe35e4d86f7ce0ac12deb50e6d189a27a29c9f47..afa08d6e886ae9056c3ff88bc3b275cd
// Paper start - stop large pitch and yaw changes from crashing the server
this.yRotO += Math.round((this.getYRot() - this.yRotO) / 360.0F) * 360.0F;
@@ -3177,7 +3177,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3174,7 +3174,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.yHeadRotO += Math.round((this.yHeadRot - this.yHeadRotO) / 360.0F) * 360.0F;
// Paper end
@@ -1207,7 +1207,7 @@ index fe35e4d86f7ce0ac12deb50e6d189a27a29c9f47..afa08d6e886ae9056c3ff88bc3b275cd
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3467,19 +3467,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3464,19 +3464,19 @@ public abstract class LivingEntity extends Entity implements Attackable {
}
this.setDeltaMovement(d0, d1, d2);
@@ -1232,7 +1232,7 @@ index fe35e4d86f7ce0ac12deb50e6d189a27a29c9f47..afa08d6e886ae9056c3ff88bc3b275cd
if (this.jumping && this.isAffectedByFluids()) {
double d3;
@@ -3506,8 +3506,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3503,8 +3503,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.noJumpDelay = 0;
}
@@ -1243,7 +1243,7 @@ index fe35e4d86f7ce0ac12deb50e6d189a27a29c9f47..afa08d6e886ae9056c3ff88bc3b275cd
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3534,8 +3534,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3531,8 +3531,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.travel(vec3d1);
}
@@ -1254,7 +1254,7 @@ index fe35e4d86f7ce0ac12deb50e6d189a27a29c9f47..afa08d6e886ae9056c3ff88bc3b275cd
if (!this.level().isClientSide && !this.isDeadOrDying() && !freezeLocked) { // Paper - Freeze Tick Lock API
int i = this.getTicksFrozen();
@@ -3552,15 +3552,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -3549,15 +3549,15 @@ public abstract class LivingEntity extends Entity implements Attackable {
this.hurt(this.damageSources().freeze(), 1.0F);
}