Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-04-03 21:12:44 +01:00
parent b07d19630a
commit fbf54955d5
25 changed files with 100 additions and 98 deletions

View File

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