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 1bb24ae5896681760710bb23bb083d0efdcc9c71 Mon Sep 17 00:00:00 2001
From 080e5d215fc7add653dfa942b37b83683798f474 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 64c35df..6443f65 100644
index 5fbad9f..366d1ae 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1344,6 +1344,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1332,6 +1332,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);