Update upstream B/CB/S

This commit is contained in:
Zach Brown 2017-02-17 20:03:38 -06:00
parent f654bf8fc2
commit ae98591b8c
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
25 changed files with 165 additions and 166 deletions

View file

@ -1,14 +1,14 @@
From 87d8e5e8a31d66af1e7ff8eaa2655fbeed5e0f47 Mon Sep 17 00:00:00 2001
From 9c22321ff1ec4a12a4d82957cc689f8493cb99cc 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 366d1ae8..6f9836cd 100644
index 98d3520..845fa88 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1346,6 +1346,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1394,6 +1394,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setAffectsSpawning(boolean affects);
@ -30,5 +30,5 @@ index 366d1ae8..6f9836cd 100644
public class Spigot extends Entity.Spigot
{
--
2.11.0.windows.3
2.9.3