Fix up patch tree.

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-10-09 18:22:37 +11:00
parent ffa66cbd53
commit 43fe7d7945
2 changed files with 8 additions and 12 deletions

View File

@@ -1,17 +1,14 @@
From 228b3e3112bbfc6e56b082ffabf68774f8a7c87c Mon Sep 17 00:00:00 2001
From 555ab8ce507ae4a847914d9682608f40dbae92cc Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:34:49 +0200
Subject: [PATCH] Implement respawn API.
---
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 33674b1..2c607aa 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1135,6 +1135,15 @@ public void setCollidesWithEntities(boolean collides)
@@ -1135,6 +1135,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().collidesWithEntities = collides;
getHandle().m = collides; // First boolean of Entity
}
@@ -28,4 +25,5 @@ index 33674b1..2c607aa 100644
public Player.Spigot spigot()
--
1.8.4
1.8.1.2