mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit/Spigot)

Browse source 
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
4b08dbc5 PR-752: Make Leaves Waterlogged
de323fc9 Downgrade dependency version

CraftBukkit Changes:
c3f219edb Fix missing abstract in CraftLeaves
886e6d8c8 SPIGOT-7038: Setting title or subtitle to empty string causes the player to disconnect
6c302a5e3 Make Leaves Waterlogged
53b681be5 Downgrade dependency version

Spigot Changes:
ee737122 Fixed system messages shown in action bar
f343df82 SPIGOT-7036: Don't use CHAT message type
63a06049 SPIGOT-7035: Actionbar Sending in Main Chat
This commit is contained in:
Jake Potrebic 2022-06-08 00:49:02 -07:00
parent a1d0432c2c
commit aabbfcdf8d
No known key found for this signature in database
GPG key ID: ECE0B3C133C016C5
38 changed files with 107 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

22
patches/server/0008-Adventure.patch
View file

@ -2480,10 +2480,10 @@ index 446fdca49a5a6999626a7ee3a1d5c168b15a09dd..f9863e138994f6c7a7975a852f106faa
public boolean isOp() {
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 765659b39d30e2e5c491c0808fe1808776ea767b..96011a24045b79ba5bab12aaa308426577d755a2 100644
index fe392a144edc3282793449cac6c9c953d9648a9e..4c939de8822b064f0e44b741c4b3807ba13e5e9e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -270,14 +270,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -269,14 +269,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getDisplayName() {
@ -2523,7 +2523,7 @@ index 765659b39d30e2e5c491c0808fe1808776ea767b..96011a24045b79ba5bab12aaa3084265
@Override
public String getPlayerListName() {
return this.getHandle().listName == null ? getName() : CraftChatMessage.fromComponent(this.getHandle().listName);
@@ -296,42 +321,42 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -295,42 +320,42 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
@ -2575,7 +2575,7 @@ index 765659b39d30e2e5c491c0808fe1808776ea767b..96011a24045b79ba5bab12aaa3084265
this.getHandle().connection.send(packet);
}
@@ -363,6 +388,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -362,6 +387,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().connection.disconnect(message == null ? "" : message);
}
@ -2599,7 +2599,7 @@ index 765659b39d30e2e5c491c0808fe1808776ea767b..96011a24045b79ba5bab12aaa3084265
@Override
public void setCompassTarget(Location loc) {
if (this.getHandle().connection == null) return;
@@ -618,6 +660,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -617,6 +659,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().connection.send(packet);
}
@ -2635,7 +2635,7 @@ index 765659b39d30e2e5c491c0808fe1808776ea767b..96011a24045b79ba5bab12aaa3084265
@Override
public void sendSignChange(Location loc, String[] lines) {
this.sendSignChange(loc, lines, DyeColor.BLACK);
@@ -645,14 +716,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -644,14 +715,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
Component[] components = CraftSign.sanitizeLines(lines);
@ -2653,7 +2653,7 @@ index 765659b39d30e2e5c491c0808fe1808776ea767b..96011a24045b79ba5bab12aaa3084265
}
@Override
@@ -1423,7 +1495,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1422,7 +1494,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setResourcePack(String url) {
@ -2662,7 +2662,7 @@ index 765659b39d30e2e5c491c0808fe1808776ea767b..96011a24045b79ba5bab12aaa3084265
}
@Override
@@ -1438,7 +1510,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1437,7 +1509,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setResourcePack(String url, byte[] hash, boolean force) {
@ -2671,7 +2671,7 @@ index 765659b39d30e2e5c491c0808fe1808776ea767b..96011a24045b79ba5bab12aaa3084265
}
@Override
@@ -1454,6 +1526,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1453,6 +1525,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
@ -2693,7 +2693,7 @@ index 765659b39d30e2e5c491c0808fe1808776ea767b..96011a24045b79ba5bab12aaa3084265
public void addChannel(String channel) {
Preconditions.checkState(this.channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
channel = StandardMessenger.validateAndCorrectChannel(channel);
@@ -1858,6 +1945,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1857,6 +1944,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return (this.getHandle().clientViewDistance == null) ? Bukkit.getViewDistance() : this.getHandle().clientViewDistance;
}
@ -2706,7 +2706,7 @@ index 765659b39d30e2e5c491c0808fe1808776ea767b..96011a24045b79ba5bab12aaa3084265
@Override
public int getPing() {
return this.getHandle().latency;
@@ -1903,6 +1996,207 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1902,6 +1995,207 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().allowsListing();
}