Update upstream B/CB

This commit is contained in:
Zach Brown 2017-03-31 23:24:42 -05:00
parent e6a7d357ce
commit e4a071f6e4
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
21 changed files with 117 additions and 117 deletions

View file

@ -1,14 +1,14 @@
From 018db8157353aedb75b2ee059924eff54229fbaa Mon Sep 17 00:00:00 2001
From 1419e3a2f80a01da0b33d85c86e5f8c083b39caf 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 ee88f26..98d3520 100644
index 517e69f8..2f80d248 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1380,6 +1380,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1386,6 +1386,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 ee88f26..98d3520 100644
public class Spigot extends Entity.Spigot
{
--
2.9.3
2.12.1.windows.1