Upstream merge: Chicken jockey despawning and generation fixes

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-04-30 15:13:37 +01:00
parent d5a12c4949
commit 5f09e7b594
8 changed files with 22 additions and 22 deletions

View File

@@ -1,4 +1,4 @@
From bc6f8371fb5e19fb85b9906114623ee141fb3baf Mon Sep 17 00:00:00 2001
From c2fcfa5b972d14089d629654b57408def309f9f2 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 452f6f3..a36297d 100644
index 81913ac..1317254 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -805,28 +805,18 @@ public class CraftWorld implements World {
@@ -808,28 +808,18 @@ public class CraftWorld implements World {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
}
@@ -59,7 +59,7 @@ index 452f6f3..a36297d 100644
}
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1316,6 +1306,56 @@ public class CraftWorld implements World {
@@ -1319,6 +1309,56 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{