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

Upstream merge

Browse Source
This commit is contained in:
Thinkofdeath
2015-03-17 21:22:17 +00:00
committed by Zach Brown
parent a34dea5aed
commit 4c22e13cf9
6 changed files with 30 additions and 17 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 46f2bc4a1fa7f46ab1b371eadb9629793ca2044e Mon Sep 17 00:00:00 2001
From 399bfbc662d9ecfb09fd37ec5f99c3ae6f85fff7 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 609b483..5dc77b1 100644
index f4b2f39..67b6dc3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -822,28 +822,18 @@ public class CraftWorld implements World {
@@ -826,28 +826,18 @@ public class CraftWorld implements World {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
}
@@ -60,7 +60,7 @@ index 609b483..5dc77b1 100644
}
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1361,6 +1351,70 @@ public class CraftWorld implements World {
@@ -1365,6 +1355,70 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{