Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@5ffdff8 Fix a couple of bed bugs (#9112)
PaperMC/Paper@e338793 Optimize hoppers by not trying to merge full items. (#9110)
PaperMC/Paper@bd35d60 [ci-skip] Fix missing closing quote (#9126)
PaperMC/Paper@8d040fa Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
granny
2023-04-13 18:05:06 -07:00
parent f952106e1b
commit f69b21de45
9 changed files with 20 additions and 20 deletions

View File

@@ -218,10 +218,10 @@ 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 7015d95a53dc55ab4ccd15fa2b98716bbb460dae..ee6d2faa7ca9d6bc43b08192ecbcebb36e679df1 100644
index 4cbd2816f0cdd0d7745bc70ccd0b288769e74498..aeea585b802966cd599e33a45887899cad31872b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -530,10 +530,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -529,10 +529,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setPlayerListName(String name) {
@@ -238,7 +238,7 @@ index 7015d95a53dc55ab4ccd15fa2b98716bbb460dae..ee6d2faa7ca9d6bc43b08192ecbcebb3
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()));
@@ -3195,5 +3200,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3194,5 +3199,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean usesPurpurClient() {
return getHandle().purpurClient;
}