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

Updated Upstream (Bukkit/CraftBukkit) (#7022)

Browse source
This commit is contained in:
Jake Potrebic 2021-12-04 23:11:59 -08:00 • committed by GitHub
parent a8e5141f2a
commit fd352861b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
69 changed files with 281 additions and 247 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 b83978957c867084decd3cd63e5ea03880f304b5..27eb934e762fb67dd69804d463e00a99e4431b16 100644
index 8975e64f40e6faeda38332ae0baba63af4146553..52d8d73cf95d36ca3fd44408aea785f3f7351c05 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1800,8 +1800,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1801,8 +1801,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {
return this.getHandle().locale;