update upstream

This commit is contained in:
Aikar
2018-07-29 12:42:07 -04:00
parent 6d166798e6
commit 566740114e
79 changed files with 450 additions and 459 deletions

View File

@@ -1,14 +1,14 @@
From 3308624206985251b7646042a4276f026c169c0b Mon Sep 17 00:00:00 2001
From 360891817c22a8bf6705820bde2579dc065224a7 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 25e44028..7f215f1a 100644
index 4412f6eea..d5b904e61 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1450,6 +1450,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1497,6 +1497,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setAffectsSpawning(boolean affects);
@@ -30,5 +30,5 @@ index 25e44028..7f215f1a 100644
public class Spigot extends Entity.Spigot
{
--
2.17.0 (Apple Git-106)
2.18.0