mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Upstream merge

Browse source
This commit is contained in:
md_5 2013-12-18 17:48:18 +11:00
parent fe00a77ac8
commit e9cb6ec3c5
36 changed files with 109 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Bukkit-Patches/0008-Add-Particle-API.patch
View file

@ -1,11 +1,11 @@
From ae6b528446bfbe1c5c5e8d4301287364f0cc8ddd Mon Sep 17 00:00:00 2001
From bb9b6439fcc6c3657b5f778b681e39e0f1b9ee34 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
diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
index 708bee9..62c7c11 100644
index 2474a2d..4a4a12d 100644
--- a/src/main/java/org/bukkit/Effect.java
+++ b/src/main/java/org/bukkit/Effect.java
@@ -5,6 +5,7 @@ import java.util.Map;
@ -16,7 +16,7 @@ index 708bee9..62c7c11 100644
import org.bukkit.potion.Potion;
/**
@@ -78,27 +79,178 @@ public enum Effect {
@@ -79,27 +80,178 @@ public enum Effect {
/**
* The flames seen on a mobspawner; a visual effect.
*/
@ -199,7 +199,7 @@ index 708bee9..62c7c11 100644
* @deprecated Magic value
*/
@Deprecated
@@ -107,6 +259,15 @@ public enum Effect {
@@ -108,6 +260,15 @@ public enum Effect {
}
/**
@ -215,16 +215,17 @@ index 708bee9..62c7c11 100644
* @return The type of the effect.
*/
public Type getType() {
@@ -114,7 +275,7 @@ public enum Effect {
@@ -115,8 +276,7 @@ public enum Effect {
}
/**
- * @return The class which represents data for this effect, or null if none
- * @return The class which represents data for this effect, or null if
- * none
+ * @return if this Effect isn't of type PARTICLE it returns the class which represents data for this effect, or null if none
*/
public Class<?> getData() {
return this.data;
@@ -134,12 +295,32 @@ public enum Effect {
@@ -136,12 +296,32 @@ public enum Effect {
static {
for (Effect effect : values()) {
@ -260,10 +261,10 @@ index 708bee9..62c7c11 100644
+ public enum Type {SOUND, VISUAL, PARTICLE}
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 62fadda..39c72c5 100644
index f02bfb7..a58eb05 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1070,6 +1070,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1151,6 +1151,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean isGameRule(String rule);
@ -321,10 +322,10 @@ index 62fadda..39c72c5 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 cc9c3b2..8eab616 100644
index 22bce07..9b4c28f 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -736,6 +736,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -803,6 +803,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}
@ -354,5 +355,5 @@ index 08aa71d..5217aec 100644
}
}
--
1.8.1.2
1.8.3.2