Update Upstream

This commit is contained in:
Aikar 2016-11-18 23:58:56 -05:00
parent ae5a66ed1b
commit 9725050889
24 changed files with 110 additions and 107 deletions

View file

@ -1,14 +1,14 @@
From 00efa3c0c22089c8778084375d22a5ace948cd04 Mon Sep 17 00:00:00 2001
From ccafae7c8b4e1ef3a9fece0582e1a2cacddddd00 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 54e8a5c..c86a65c 100644
index b4a4ed5..b725fac 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1284,6 +1284,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1329,6 +1329,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
@ -30,5 +30,5 @@ index 54e8a5c..c86a65c 100644
public class Spigot extends Entity.Spigot
{
--
2.8.3
2.10.2