Upstream merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-08-03 18:45:50 +10:00
parent 5ed5fdbdc3
commit 19214d1353
15 changed files with 57 additions and 53 deletions

View File

@@ -1,4 +1,4 @@
From 8a68a3ace4aac7d385184dbd10b33140dcc8be60 Mon Sep 17 00:00:00 2001
From 3210cbac122199792cd0215e413c8a6b10c55f76 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:57:09 +1000
Subject: [PATCH] Add Particle API
@@ -320,10 +320,10 @@ index e14fe40..9ae9b2d 100644
* Represents various map environment types that a world may be
*/
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 0519c55..d602594 100644
index 8402be7..a809f18 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -706,6 +706,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -720,6 +720,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}