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

Update upstream B/CB

Browse Source
This commit is contained in:
Zach Brown
2016-06-11 22:22:27 -05:00
parent 83191ef7a1
commit 14ffaf5d2c
23 changed files with 81 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 14c640771aee1360601efd5bfa9c92e3c634a903 Mon Sep 17 00:00:00 2001
From 9f4ad2b7defdfba2a0e64ed9f04182c8f6918996 Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent
@@ -34,10 +34,10 @@ index e9baaa2..d084fc2 100644
this.ci = packetplayinsettings.d();
this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e()));
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f50216f..783dfbd 100644
index e20c4ef..3f871a7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1656,7 +1656,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1671,7 +1671,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale()
{