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

Update upstream B/CB/S

Browse Source
This commit is contained in:
Zach Brown
2017-02-17 20:03:38 -06:00
parent f654bf8fc2
commit ae98591b8c
25 changed files with 165 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch
View File

@@ -1,11 +1,11 @@
From 681b5bbd1941e58fa30fb659b4be06197672428b Mon Sep 17 00:00:00 2001
From e3f54d74fe213cbfb28b5e180693369a4ab8c634 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
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index e3a3ed4..548fa97 100644
index 29ad8e2..f07c3de 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -29,7 +29,7 @@ import org.bukkit.inventory.MainHand;
@@ -34,10 +34,10 @@ index e3a3ed4..548fa97 100644
this.ch = packetplayinsettings.d();
this.getDataWatcher().set(EntityPlayer.bq, 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 eaf7954..3edeb49 100644
index 3b91e46..84b2e54 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1690,7 +1690,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1701,7 +1701,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale()
{