Update upstream tacos B/CB/S

Spigot-Server-Patches/0134-Implement-PlayerLocaleChangeEvent.patch

@@ -1,4 +1,4 @@
-From e9c013296bbcc5353de1a2e9795b6b3a0839198d Mon Sep 17 00:00:00 2001
+From 6f704a2371844fedc58d1c405720b925db4bc2b6 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 e20c4ef..3f871a7 100644
+index f2d1b21..3b95336 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1671,7 +1671,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1675,7 +1675,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          @Override
          public String getLocale()
          {
@@ -50,5 +50,5 @@ index e20c4ef..3f871a7 100644
  
          @Override
 -- 
-2.9.0
+2.9.0.windows.1