Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@eb60bff Create raw chat type as resource file instead of in source (#9226)
PaperMC/Paper@99b311d [ci skip] Clarify where furnace-related events are called (#8753)
PaperMC/Paper@83cfeb1 Improve java version check (#9692)
PaperMC/Paper@deb92c2 Add ItemStack#isEmpty and related methods (#9664)
PaperMC/Paper@0c8e84c Enforce sign line nullability when setting line with Adventure Method (#9689)
PaperMC/Paper@ede9c06 Fix Projectile#setOwner(null) not clearing owner (#9715)
PaperMC/Paper@e312ebb Add DISPLAY tracking range type (#9668)
PaperMC/Paper@06a741d Fix leashed pets teleporting to owner when loaded (#9686)
PaperMC/Paper@064fb50 Cleanup old async commands patch (#8895)
PaperMC/Paper@d8af99a Fix silent equipment change for mobs (#9677)
PaperMC/Paper@3cec9c9 [ci skip] Add missing javadoc links (#9497)
PaperMC/Paper@ba0e1f5 Fix sapling observer detection and grow event (#9654)
PaperMC/Paper@a856073 Fix two beacon bugs (#9675)
PaperMC/Paper@581b683 Fix spigot's Forced-Stats (#9663)
This commit is contained in:
granny
2023-09-16 21:46:19 -07:00
parent 07b13f287c
commit b0a7353a70
30 changed files with 228 additions and 107 deletions

View File

@@ -389,10 +389,10 @@ index aa3f4ca3be843616d34897e41909255f512f8963..426ac5faa9344472560fb20bdea8bdc3
++j;
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index f4e1fc878ecf72dafade1c72869c9656a0c5b8aa..319c469c20f3cb4f6d61425bfa6d98b55b55c4d6 100644
index 2d8dbcab5760d4b1879d17642c8e3b2658e4d7ec..3a7c694ff0e248df3f4d168a5e2e883c0e3cb167 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -637,20 +637,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -640,20 +640,20 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
}
protected void tick(BooleanSupplier shouldKeepTicking) {
@@ -801,7 +801,7 @@ index 01f001c39581c4af5765548e221e254465fe0195..2f013c3365d065325d645d43f7c5137f
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
playerlist.sendLevelInfo(this, worldserver);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 5feaf5bb7e366f593d5700fb78243a824ce97f9c..e22f403c54922f05d6d5704ec648dce02097bbb0 100644
index dfc84223a083890cd78b77029e1f85eb23f66229..1c5d3dd9a962edaf49be9397fc5ce9e1f4924e86 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -412,7 +412,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1162,7 +1162,7 @@ index 156c2683d72c5e83b1cefb9ebf356c6e4d31e7f4..e634f9b7998979e00e4de4899214863e
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index fa8c8201d85ce1ceb87941ec082db61a7c9136da..028226133deaf7ca064e16917ea7238f778f82e2 100644
index e843992c8737210c106d6281a3b5cd13b85a5cff..9dc72ff027594c848d408bb211549ba6fd890c4b 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 {
@@ -1273,7 +1273,7 @@ index fa8c8201d85ce1ceb87941ec082db61a7c9136da..028226133deaf7ca064e16917ea7238f
// Purpur start
if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 7dae759b777cf9077bf46d2e1189c20c1c2db60e..19d9d3a9f634631e2ec5a6fa7f2cd9dd18f62f89 100644
index 1910f1ad22b2d2b79ad0161d20dcc9772ff2bd7f..5dd0c925af627f7159289dc1e3e79bc593c421f2 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -365,13 +365,13 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1746,7 +1746,7 @@ index 8f97c9df726ac20cfce7bdddd5dd4f8c5aa76c35..e35ebb5b923c2f63e37e5dae006bc4a0
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index bd3403428ed721de913c86f508e8cc9349579913..80ab17142c34d576409e5fb353ff31db9673b2c0 100644
index 233980edc80fa0f15756f6d16b76b1f84bd79920..713a091b8083e46b395311889c2a1482279c27ec 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1012,9 +1012,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {