SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-04-18 17:08:19 +00:00
parent 1f1443ed34
commit 804a818172
17 changed files with 84 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 5c1e787e2e1b96758e403785b2cacbf5ccd05c6b Mon Sep 17 00:00:00 2001
From 0952167f4e9323fbba6a59b610251bd01c9b0959 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,7 +18,7 @@ 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 bfa8c23..827ec16 100644
index 1f26312..58c64fd 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -779,28 +779,18 @@ public class CraftWorld implements World {
@@ -59,7 +59,7 @@ index bfa8c23..827ec16 100644
}
public <T extends Entity> T spawn(Location location, Class<T> clazz) throws IllegalArgumentException {
@@ -1286,6 +1276,56 @@ public class CraftWorld implements World {
@@ -1290,6 +1280,56 @@ public class CraftWorld implements World {
// Spigot start
private final Spigot spigot = new Spigot()
{
@@ -117,7 +117,7 @@ index bfa8c23..827ec16 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 cb858a0..5de0000 100644
index dd80ab7..4d4516f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1325,6 +1325,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -171,5 +171,5 @@ index cb858a0..5de0000 100644
public Player.Spigot spigot()
--
1.8.3.2
1.9.1