From 3c872410f55bad818c50a9663ace633947449e1d Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 3 Jul 2013 14:16:28 +1000 Subject: [PATCH] Update again - git isn't as smart as he looks --- .../0003-Skeleton-API-Implementations.patch | 10 +++++----- .../0012-Async-Operation-Catching.patch | 6 +++--- CraftBukkit-Patches/0029-BungeeCord-Support.patch | 6 +++--- CraftBukkit-Patches/0039-Particle-API.patch | 10 +++++----- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index 5ed1eb2d31..4c35ceab02 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 8e1fe60b678de75432cbd146c31eaa867ccf99aa Mon Sep 17 00:00:00 2001 +From af557fd6f13fce2560eb4889cf556c88cc045298 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -43,12 +43,12 @@ index b46b9c4..c91b12c 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 583b99c..1d97430 100644 +index 977adff..5628d84 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -997,4 +997,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - - this.server.getScoreboardManager().setPlayerBoard(this, scoreboard); +@@ -1010,4 +1010,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + public boolean isScaledHealth() { + return this.scaledHealth; } + + // Spigot start diff --git a/CraftBukkit-Patches/0012-Async-Operation-Catching.patch b/CraftBukkit-Patches/0012-Async-Operation-Catching.patch index d996e8817a..28fb36f9c2 100644 --- a/CraftBukkit-Patches/0012-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0012-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From 20ac68be1e39187e6c5f68d20619c86bacd05cb9 Mon Sep 17 00:00:00 2001 +From 2ca037f07251ec82625905573ff1926563aacbdc Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 7 Mar 2013 20:12:46 +1100 Subject: [PATCH] Async Operation Catching @@ -102,10 +102,10 @@ index 4c16040..8508d22 100644 if (generate) { // Use the default variant of loadChunk when generate == true. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1d97430..b3bb702 100644 +index 5628d84..5bf0e3c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -214,6 +214,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -215,6 +215,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } public void kickPlayer(String message) { diff --git a/CraftBukkit-Patches/0029-BungeeCord-Support.patch b/CraftBukkit-Patches/0029-BungeeCord-Support.patch index 7c507793f1..bf5a7c4132 100644 --- a/CraftBukkit-Patches/0029-BungeeCord-Support.patch +++ b/CraftBukkit-Patches/0029-BungeeCord-Support.patch @@ -1,4 +1,4 @@ -From 9851a70c8386c432d36d0ddc9a8c4851b969f92d Mon Sep 17 00:00:00 2001 +From f71f95a3cdcc53fec5d01450691202e21360ae08 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 11:15:11 +1100 Subject: [PATCH] BungeeCord Support @@ -59,10 +59,10 @@ index f87ebf9..f5032be 100644 event.disallow(asyncEvent.getResult(), asyncEvent.getKickMessage()); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b3bb702..b81a07e 100644 +index 5bf0e3c..8af2934 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1002,6 +1002,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1015,6 +1015,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { // Spigot start private final Spigot spigot = new Spigot() { diff --git a/CraftBukkit-Patches/0039-Particle-API.patch b/CraftBukkit-Patches/0039-Particle-API.patch index 89351e710a..00966ab1ce 100644 --- a/CraftBukkit-Patches/0039-Particle-API.patch +++ b/CraftBukkit-Patches/0039-Particle-API.patch @@ -1,4 +1,4 @@ -From 91ae782ce9d2bfc7192d65c7684156322c8d8aaa Mon Sep 17 00:00:00 2001 +From 4ec392f28cfe983d68545ec7180b3df783e2f396 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 16:14:30 +1000 Subject: [PATCH] Particle API @@ -152,10 +152,10 @@ index 8508d22..9da1a47 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 b81a07e..011b5fa 100644 +index 8af2934..88dcced 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -266,13 +266,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -267,13 +267,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().playerConnection.sendPacket(packet); } @@ -173,7 +173,7 @@ index b81a07e..011b5fa 100644 public void playEffect(Location loc, Effect effect, T data) { if (data != null) { -@@ -280,9 +278,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -281,9 +279,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } else { Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); } @@ -191,7 +191,7 @@ index b81a07e..011b5fa 100644 } public void sendBlockChange(Location loc, Material material, byte data) { -@@ -1007,6 +1010,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1020,6 +1023,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player { { return ( getHandle().playerConnection == null ) ? null : (InetSocketAddress) getHandle().playerConnection.networkManager.getSocket().getRemoteSocketAddress(); }