Update upstream B/CB

Closes GH-569
This commit is contained in:
Zach Brown 2017-01-06 15:45:59 -06:00
parent 849653ebac
commit 63130fd2aa
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
140 changed files with 381 additions and 544 deletions

View file

@ -1,14 +1,14 @@
From eb40756df6e39375611efba72fa447f576574c86 Mon Sep 17 00:00:00 2001
From 22ab319e4192a07fd7b35c388d702ab194ff9d78 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 18:05:37 -0600
Subject: [PATCH] Add player view distance API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 6443f65..ebe727a 100644
index 366d1ae..6f9836c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1358,6 +1358,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1346,6 +1346,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setAffectsSpawning(boolean affects);