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

Upstream Merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-08-04 08:51:09 +10:00
parent 4d8ae2cd25
commit eb9d70ade9
11 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0039-Particle-API.patch
View File

@@ -1,4 +1,4 @@
From aba117a1c6cc8fa223c803c82e879f83cc4ae828 Mon Sep 17 00:00:00 2001
From b23f908193514fa253e4c41dc3db750f66f2f7ec Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 16:14:30 +1000
Subject: [PATCH] Particle API
@@ -43,10 +43,10 @@ index 7de0de5..7eca388 100644
datavalue = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index e8bb8ae..a68169f 100644
index 7601fb5..6d22e82 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -766,31 +766,21 @@ public class CraftWorld implements World {
@@ -765,31 +765,21 @@ public class CraftWorld implements World {
} else {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
}
@@ -88,7 +88,7 @@ index e8bb8ae..a68169f 100644
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
return spawn(location, clazz, SpawnReason.CUSTOM);
}
@@ -1271,6 +1261,62 @@ public class CraftWorld implements World {
@@ -1273,6 +1263,62 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{