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

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7359)

Browse source
This commit is contained in:
Jake Potrebic 2022-01-22 16:59:56 -08:00 • committed by GitHub
parent 60e46abb00
commit 512995c2a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
108 changed files with 345 additions and 363 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0023-Player-affects-spawning-API.patch
View file

@ -117,10 +117,10 @@ index c65d1dc6eb0c1fc7c4a91faf0f1c6f26b3c2a76e..0dc46471f7247e5d36c3896a0c874730
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 d4444384fae41b3c502e8a34ccd88041928de67d..1195cf6c72cbf14d49ef709d54315ad998142656 100644
index 3869717bb9246cabf900840aac93eaa3e6b7fbf7..13d9bcb9ccc34bf81ba834365e511eabd4153aee 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1847,8 +1847,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1854,8 +1854,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {
return this.getHandle().locale;