Update upstream B/CB

This commit is contained in:
Zach Brown 2016-12-16 15:00:16 -06:00
parent f087ac45e3
commit 1d8b7e2ecc
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
12 changed files with 37 additions and 46 deletions

View file

@ -1,14 +1,14 @@
From ccafae7c8b4e1ef3a9fece0582e1a2cacddddd00 Mon Sep 17 00:00:00 2001
From 1bb24ae5896681760710bb23bb083d0efdcc9c71 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 b4a4ed5..b725fac 100644
index 64c35df..6443f65 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1329,6 +1329,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1344,6 +1344,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 b4a4ed5..b725fac 100644
public class Spigot extends Entity.Spigot
{
--
2.10.2
2.9.3