Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Upstream merge.

Browse Source
This commit is contained in:
md_5
2015-01-12 20:08:41 +11:00
committed by Zach Brown
parent fb6f1e914b
commit 3de5e003f5
6 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 37586b4524ce86035912e75dff6a03f252012546 Mon Sep 17 00:00:00 2001
From 96b0a2e9d93bd34b4fb865fe9b1bd78fcc700609 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,10 +19,10 @@ 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 3b660ff..eeb1ecb 100644
index 50469b1..a57136c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -816,28 +816,18 @@ public class CraftWorld implements World {
@@ -841,28 +841,18 @@ public class CraftWorld implements World {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
}
@@ -60,7 +60,7 @@ index 3b660ff..eeb1ecb 100644
}
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1355,6 +1345,70 @@ public class CraftWorld implements World {
@@ -1380,6 +1370,70 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{