SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge some stuff from upstream.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-02 17:54:35 +11:00
parent 04c83ec337
commit c936739c09
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);

6
Bukkit-Patches/0024-Silenceable-Lightning-API.patch
View File

@@ -1,14 +1,14 @@
From ee7e81c4564a2917dbf3432275366f1e0a0d5eba Mon Sep 17 00:00:00 2001
From 4a9e3da0eefb80e5c6eea75b99f965da7d4d7354 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:29 -0400
Subject: [PATCH] Silenceable Lightning API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index a58eb05..80ca41a 100644
index 6cf3ff0..ab73174 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1196,6 +1196,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1200,6 +1200,30 @@ public interface World extends PluginMessageRecipient, Metadatable {
{
throw new UnsupportedOperationException( "Not supported yet." );
}