update upstream

This commit is contained in:
Aikar 2018-07-29 12:42:07 -04:00
parent 6d166798e6
commit 566740114e
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
79 changed files with 450 additions and 459 deletions

View file

@ -1,14 +1,14 @@
From a42df28f550f5777aad4f7568704cd1751edbe0a Mon Sep 17 00:00:00 2001
From a2109a705cd50a98a3ecfd75285838711f9966a0 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Mon, 29 Feb 2016 17:22:34 -0600
Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 116a1e7a..0481f15b 100644
index d3965bb38..4412f6eea 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1436,6 +1436,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1483,6 +1483,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public String getLocale();