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 080e5d215fc7add653dfa942b37b83683798f474 Mon Sep 17 00:00:00 2001
From 018db8157353aedb75b2ee059924eff54229fbaa 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 5fbad9f..366d1ae 100644
index ee88f26..98d3520 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1332,6 +1332,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1380,6 +1380,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);