Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@39d3a03 Fix Player#chat for 1.19.3 (#8684)
PaperMC/Paper@aa9c200 Fix metrics reporting unknown paper version (#8683)
PaperMC/Paper@44dc5a4 Don't call lock check event if the block entity doesn't exist (#8687)
PaperMC/Paper@86ed0d5 ChatProcessor fixes (#8690)
PaperMC/Paper@f3eb2c7 Fix reobf issue in previous commit
PaperMC/Paper@cf31151 [ci skip] Fix readme badge (#8693)
This commit is contained in:
BillyGalbreath
2022-12-17 10:40:13 -06:00
parent 7062a32f8f
commit 07afb7204e
11 changed files with 34 additions and 26 deletions

View File

@@ -78,7 +78,7 @@ index 95a6284026d17567deb7416abe2bc4d6975aaaf8..053ec306027a83cdd06d10197d47d7ed
blockEntity.teleportCooldown = 100;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 3ac836bd6fccf66771dc0141b9b6a25da9837211..09b997701f7ebd2d3a8abe90dcf933c0037a95e0 100644
index ba898640a8f693e8bae43281b170d3505154b273..39ae7bdac23601c567013799375bf32b96d4e1fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -572,6 +572,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -93,10 +93,10 @@ index 3ac836bd6fccf66771dc0141b9b6a25da9837211..09b997701f7ebd2d3a8abe90dcf933c0
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3f08e9162ccb21661daa021d1c82e917ea089b7e..9ca8dab9976838c22cd759ae67c6c0821734cf0d 100644
index f61a1326fa943b606de8f75a6b7f95b9e220047a..7448c124fd155d832c999f16b4ecdbfeec8c6119 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1267,6 +1267,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1268,6 +1268,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API