Update to 1.12-pre6

This commit is contained in:
Shane Freeder
2017-05-31 09:04:52 +01:00
parent 529a9626f4
commit 9cf2e3b3dc
38 changed files with 79 additions and 77 deletions

View File

@@ -5,14 +5,14 @@ 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 6fdde5c07..33f34ed0e 100644
index 59967e81e..49795c588 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -0,0 +0,0 @@ import org.bukkit.inventory.MainHand;
public class EntityPlayer extends EntityHuman implements ICrafting {
private static final Logger bV = LogManager.getLogger();
- public String locale = "en_us"; // PAIL: private -> public
- public String locale = "en_us"; // CraftBukkit - lowercase
+ public String locale = null; // PAIL: private -> public // Paper - default to null
public PlayerConnection playerConnection;
public final MinecraftServer server;