5b4bc3081a
Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
From 991a52b5b0491761079cc39b3d02638bfb975018 Mon Sep 17 00:00:00 2001
|
|
From: Smove <jan@lavasurvival.net>
|
|
Date: Sat, 1 Feb 2014 18:12:16 +1100
|
|
Subject: [PATCH] Implement Locale Getter for Players
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
index 7eb66ea..a48a1c0 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -30,7 +30,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
|
|
public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
|
|
private static final Logger bL = LogManager.getLogger();
|
|
- private String locale = "en_US";
|
|
+ public String locale = "en_US"; // Spigot
|
|
public PlayerConnection playerConnection;
|
|
public final MinecraftServer server;
|
|
public final PlayerInteractManager playerInteractManager;
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
index 5a39069..3ef8662 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
|
@@ -1363,6 +1363,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|
getHandle().playerConnection.sendPacket( packet );
|
|
}
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public String getLocale()
|
|
+ {
|
|
+ return getHandle().locale;
|
|
+ }
|
|
};
|
|
|
|
public Player.Spigot spigot()
|
|
--
|
|
1.9.1
|
|
|