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

Merge some stuff from upstream.

Browse source
This commit is contained in:
md_5 2014-04-02 17:54:35 +11:00
parent a562fecb4b
commit 04d72bc702
14 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 855a6da4ddb7bcb75cd4c45e2dcb2b9a42c4f6f4 Mon Sep 17 00:00:00 2001
From 0d3d7850cc74fecc1cddc555e26103f2d44c7b01 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
@ -266,10 +266,10 @@ index 2474a2d..9964203 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 f02bfb7..a58eb05 100644
index 9bf2c41..6cf3ff0 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1151,6 +1151,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1155,6 +1155,56 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
public boolean isGameRule(String rule);