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

@@ -224,7 +224,7 @@ index 3b959f42d958bf0f426853aee56753d6c455fcdb..d17abb283ea818244df0379d6b57fc63
if (range < 0.0D || d < range * range) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 519bd3e027c9a78c81d129f44affa0aabaeea220..0281285ef491ef0abc1266601420345ba679a3be 100644
index 824a21f880178132dbf149b2993271f5ee7bb926..33028fa1e892408ddf1ccfdd942ade634deb1d89 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -509,10 +509,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -244,7 +244,7 @@ index 519bd3e027c9a78c81d129f44affa0aabaeea220..0281285ef491ef0abc1266601420345b
for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
if (player.getBukkitEntity().canSee(this)) {
player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
@@ -3233,5 +3238,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3228,5 +3233,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean usesPurpurClient() {
return getHandle().purpurClient;
}