Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@93829bb Account for dimension type in portal void damage check (#9602)
PaperMC/Paper@a73ed95 Updated Upstream (CraftBukkit/Spigot) (#9598)
This commit is contained in:
granny
2023-08-13 22:51:10 -07:00
parent 1846bae1b6
commit aeecb71060
20 changed files with 58 additions and 58 deletions

View File

@@ -43,10 +43,10 @@ index f2e71c26c889bdee2cd2b86dcde9d4c35a3574bd..e7f05af80292b7e60018a9b1d83616cf
try {
byte[] data = new byte[packet.data.readableBytes()];
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9273d21d59bfd93d6480e57b83ebc4b8df2cc758..519bd3e027c9a78c81d129f44affa0aabaeea220 100644
index c9e4a2635c421df192f62c0903659347bce677f9..824a21f880178132dbf149b2993271f5ee7bb926 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3227,4 +3227,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3222,4 +3222,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end