diff options
author | Jake Potrebic <[email protected]> | 2023-05-31 16:36:57 -0700 |
---|---|---|
committer | GitHub <[email protected]> | 2023-05-31 16:36:57 -0700 |
commit | ea0b63992c307cf5425ba7876d6b853ef3173b88 (patch) | |
tree | f36a493c0372d01c074f979cb5b7622649f800a8 /patches/server/0030-Player-affects-spawning-API.patch | |
parent | fa8fa1ce083521e7328dec8af97751d4bd9cebe6 (diff) | |
download | Paper-ea0b63992c307cf5425ba7876d6b853ef3173b88.tar.gz Paper-ea0b63992c307cf5425ba7876d6b853ef3173b88.zip |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9228)
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:
4727d326 Don't let Sign extend SignSide, mark API as experimental
9b29bdcc PR-845: Add preliminary support for multi sided signs
CraftBukkit Changes:
b346a5f6d PR-1170: Add preliminary support for multi sided signs
86c816189 Update SQLite version
d9324b4bc Fix addition of custom smithing trim / transform recipes
Spigot Changes:
7d7b241e Rebuild patches
Diffstat (limited to 'patches/server/0030-Player-affects-spawning-API.patch')
-rw-r--r-- | patches/server/0030-Player-affects-spawning-API.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0030-Player-affects-spawning-API.patch b/patches/server/0030-Player-affects-spawning-API.patch index 4f81895266..a2d8b6f9a7 100644 --- a/patches/server/0030-Player-affects-spawning-API.patch +++ b/patches/server/0030-Player-affects-spawning-API.patch @@ -137,10 +137,10 @@ index be6e3e21ad62da01e5e2dd78e300cbc8efdbeb42..ea98625fe7c00743b8df74a24e6d4b75 for(Player player : this.players()) { if (EntitySelector.NO_SPECTATORS.test(player) && EntitySelector.LIVING_ENTITY_STILL_ALIVE.test(player)) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index bfd61549b3df0885a03276a2acfc798f078e3245..910f95f29c033b8d7adce705eae170235acf427e 100644 +index 5237eb9d18fa3ed0474b9c3aa166058c21a66d5e..50612858a0000d488dd9838ebd79403e1edd03e4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -2236,8 +2236,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2238,8 +2238,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override public String getLocale() { return this.getHandle().locale; |