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

Update upstream CB

Browse Source
This commit is contained in:
Zach Brown
2017-07-24 06:47:43 -05:00
parent c9b00ce95d
commit 43543c78c4
13 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0117-Implement-PlayerLocaleChangeEvent.patch
View File

@@ -1,11 +1,11 @@
From afa6cc4ed26e421d7f4f9d10487359ab0a182602 Mon Sep 17 00:00:00 2001
From f27f5cde237dc3ea61e03600d2ad87315dc29931 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 95336d6c..1bc2ed0e 100644
index ccd4cabcd..6271d28a2 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand;
@@ -45,10 +45,10 @@ index 95336d6c..1bc2ed0e 100644
this.cm = 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 747de51d..2569f0b7 100644
index 17a14fdc0..b65ac0c7e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1693,7 +1693,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1723,7 +1723,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale()
{
@@ -60,5 +60,5 @@ index 747de51d..2569f0b7 100644
@Override
--
2.13.1.windows.2
2.13.3.windows.1