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-08-07 17:16:57 +10:00
parent cdd3c2f4e5
commit e36ba8dd96
13 changed files with 48 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 3210cbac122199792cd0215e413c8a6b10c55f76 Mon Sep 17 00:00:00 2001
From 67d547e70742f6fe39e9b675cb1ede34f413ceed 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
@ -259,10 +259,10 @@ index 175750f..ae1f4fd 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 e14fe40..9ae9b2d 100644
index c86cfbc..186bb77 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1063,6 +1063,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1066,6 +1066,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean isGameRule(String rule);
@ -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 8402be7..a809f18 100644
index 39d3800..be2f4dc 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -720,6 +720,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -724,6 +724,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
}