Upstream merge

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-24 16:27:12 +10:00
parent a8030addd9
commit b56d35552d
78 changed files with 483 additions and 218 deletions

View File

@@ -1,4 +1,4 @@
From 58a7ca9681577897b5d7ccdb9ae8f6db43c027cf Mon Sep 17 00:00:00 2001
From bc6f8371fb5e19fb85b9906114623ee141fb3baf Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 20 Dec 2013 21:36:06 +0000
Subject: [PATCH] Particle API
@@ -18,10 +18,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 1f26312..58c64fd 100644
index 452f6f3..a36297d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -779,28 +779,18 @@ public class CraftWorld implements World {
@@ -805,28 +805,18 @@ public class CraftWorld implements World {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
}
@@ -59,7 +59,7 @@ index 1f26312..58c64fd 100644
}
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1290,6 +1280,56 @@ public class CraftWorld implements World {
@@ -1316,6 +1306,56 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{