Update upstream B/S

This commit is contained in:
Zach Brown 2017-05-23 17:11:28 -05:00
parent c1d0b4b4c6
commit 720769bf30
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
20 changed files with 83 additions and 83 deletions

View file

@ -1,14 +1,14 @@
From 777ac30514f3a7c0fa43ab7d3a64732580a0236b Mon Sep 17 00:00:00 2001
From c298dda1b017443cf4d79d4f169344eb68b6c9c0 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 d24ef805..01c61e8e 100644
index 845c3670..95880585 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1396,6 +1396,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1402,6 +1402,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public AdvancementProgress getAdvancementProgress(Advancement advancement);
@ -30,5 +30,5 @@ index d24ef805..01c61e8e 100644
public class Spigot extends Entity.Spigot
{
--
2.11.0
2.13.0.windows.1