Update from upstream SpigotMC

3e3ea0bd0d8
320ed92779f
612de468951
This commit is contained in:
Zach Brown
2014-12-14 15:54:10 -06:00
parent b532dbb6ce
commit 8bbab87c6b
92 changed files with 330 additions and 194 deletions

View File

@@ -1,4 +1,4 @@
From 0275b4cfc6008da7830d21bc7e69bbe41a5eeada Mon Sep 17 00:00:00 2001
From c1960cb2930f4daa7cfa1470b7ff42c0b137f1f4 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
@@ -19,7 +19,7 @@ index 7de0de5..13f9e9d 100644
datavalue = 0;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 568072f..cc6c003 100644
index 62340d3..6c6284b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -811,28 +811,18 @@ public class CraftWorld implements World {
@@ -60,7 +60,7 @@ index 568072f..cc6c003 100644
}
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1331,6 +1321,70 @@ public class CraftWorld implements World {
@@ -1317,6 +1307,70 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{