From 8d428932b4007a8cfac68760c26c0dc39c4bad17 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 9 Oct 2013 18:22:37 +1100 Subject: [PATCH] Fix up patch tree. --- ...18-Respawn-API.patch => 0018-Add-respawn-API.patch} | 10 ++++------ ...pawn-API.patch => 0075-Implement-respawn-API.patch} | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) rename Bukkit-Patches/{0018-Respawn-API.patch => 0018-Add-respawn-API.patch} (74%) rename CraftBukkit-Patches/{0075-Respawn-API.patch => 0075-Implement-respawn-API.patch} (76%) diff --git a/Bukkit-Patches/0018-Respawn-API.patch b/Bukkit-Patches/0018-Add-respawn-API.patch similarity index 74% rename from Bukkit-Patches/0018-Respawn-API.patch rename to Bukkit-Patches/0018-Add-respawn-API.patch index ed97f4da2..8f0fa5772 100644 --- a/Bukkit-Patches/0018-Respawn-API.patch +++ b/Bukkit-Patches/0018-Add-respawn-API.patch @@ -1,17 +1,14 @@ -From 1b666e47c484bbf9b02653da53a53e978bc645dd Mon Sep 17 00:00:00 2001 +From 7e6fa10b69f0c1aedc0835a504135986d96d3092 Mon Sep 17 00:00:00 2001 From: ninja- Date: Tue, 8 Oct 2013 14:35:58 +0200 Subject: [PATCH] Add respawn API. ---- - src/main/java/org/bukkit/entity/Player.java | 8 ++++++++ - 1 file changed, 8 insertions(+) diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java index 9ee8f5f..8fd9a07 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -762,6 +762,14 @@ public void setCollidesWithEntities(boolean collides) +@@ -762,6 +762,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline { throw new UnsupportedOperationException( "Not supported yet." ); } @@ -27,4 +24,5 @@ index 9ee8f5f..8fd9a07 100644 Spigot spigot(); -- -1.8.4 +1.8.1.2 + diff --git a/CraftBukkit-Patches/0075-Respawn-API.patch b/CraftBukkit-Patches/0075-Implement-respawn-API.patch similarity index 76% rename from CraftBukkit-Patches/0075-Respawn-API.patch rename to CraftBukkit-Patches/0075-Implement-respawn-API.patch index 5b7a3b9ea..3e28b8fd9 100644 --- a/CraftBukkit-Patches/0075-Respawn-API.patch +++ b/CraftBukkit-Patches/0075-Implement-respawn-API.patch @@ -1,17 +1,14 @@ -From 228b3e3112bbfc6e56b082ffabf68774f8a7c87c Mon Sep 17 00:00:00 2001 +From 555ab8ce507ae4a847914d9682608f40dbae92cc Mon Sep 17 00:00:00 2001 From: ninja- 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 +