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-22 19:50:13 +00:00
committed by Zach Brown
parent f1c39a0f62
commit 3aef9e976f
13 changed files with 67 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 399bfbc662d9ecfb09fd37ec5f99c3ae6f85fff7 Mon Sep 17 00:00:00 2001
From dedd04392e2bfbd8e535271ed3515de2b9613fa1 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 f4b2f39..67b6dc3 100644
index 609b483..5dc77b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -826,28 +826,18 @@ public class CraftWorld implements World {
@@ -822,28 +822,18 @@ public class CraftWorld implements World {
Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!");
}
@@ -60,7 +60,7 @@ index f4b2f39..67b6dc3 100644
}
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1365,6 +1355,70 @@ public class CraftWorld implements World {
@@ -1361,6 +1351,70 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{
@@ -132,7 +132,7 @@ index f4b2f39..67b6dc3 100644
public Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c28b6bc..276c9fd 100644
index 08b6f1b..8a6ea4b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -322,9 +322,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {