Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Updated Upstream (Bukkit/CraftBukkit/Spigot)"

Browse Source 
This reverts commit 23826a3f66.
This commit is contained in:
Shane Freeder
2020-10-17 10:48:00 +01:00
parent 23826a3f66
commit fa990d26af
61 changed files with 185 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0091-Implement-PlayerLocaleChangeEvent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement PlayerLocaleChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 4799bf67f0ca74cf5573ce0a553903f75b7711b7..4849a44ebbddcdd17a84cb0db3c47ea420f2bf05 100644
index 863f779453bb028d6452292663fd1e41ab434165..ed29b3cdbc0137f81d586207d4082a02d8ef73b5 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1540,16 +1540,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -29,10 +29,10 @@ index 4799bf67f0ca74cf5573ce0a553903f75b7711b7..4849a44ebbddcdd17a84cb0db3c47ea4
this.locale = packetplayinsettings.locale;
this.clientViewDistance = packetplayinsettings.viewDistance;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9aca1c0198f4d9e0b8b632aead499aaed240b091..4148b53d08d7bde1c13d9cdca4330f1313b33409 100644
index 81beabd053c024b0fc4d0948b94a8ff789cb1ba6..da264f118fca10bc7ff758e702c11f9d4885d2c2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1816,8 +1816,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1793,8 +1793,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {