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

Merge some stuff from upstream.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-02 17:54:35 +11:00
parent 04c83ec337
commit c936739c09
14 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From ec9455abc409d77b5d09d9359f4a2fd61451c88e Mon Sep 17 00:00:00 2001
From 0eb0cb2006777daefa553a233b4ececf0b365e6f 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
@@ -117,10 +117,10 @@ 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 a2638bc..03be384 100644
index 58d1435..1d2a080 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1292,6 +1292,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1293,6 +1293,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
}
}
@@ -171,5 +171,5 @@ index a2638bc..03be384 100644
public Player.Spigot spigot()
--
1.8.5.2.msysgit.0
1.8.3.2