From 57ffba423fb6def336d849bb84acb7a18ad8966e Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sun, 4 May 2014 12:38:30 +0100 Subject: [PATCH] Remove the "Allow skull owners to be removed" patch as it was fixed upstream --- ...141-Allow-skull-owners-to-be-removed.patch | 26 ------------------- ...n-that-could-kill-connections-befor.patch} | 4 +-- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 CraftBukkit-Patches/0141-Allow-skull-owners-to-be-removed.patch rename CraftBukkit-Patches/{0142-Fix-race-condition-that-could-kill-connections-befor.patch => 0141-Fix-race-condition-that-could-kill-connections-befor.patch} (97%) diff --git a/CraftBukkit-Patches/0141-Allow-skull-owners-to-be-removed.patch b/CraftBukkit-Patches/0141-Allow-skull-owners-to-be-removed.patch deleted file mode 100644 index d07c39c3b2..0000000000 --- a/CraftBukkit-Patches/0141-Allow-skull-owners-to-be-removed.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0b7f5bbb1d880be6abfe53e2b9fc1a412b28b265 Mon Sep 17 00:00:00 2001 -From: Thinkofdeath -Date: Wed, 30 Apr 2014 12:50:19 +0100 -Subject: [PATCH] Allow skull owners to be removed - - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index 2fe1000..55d1ccf 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -@@ -92,6 +92,12 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { - if (name != null && name.length() > MAX_OWNER_LENGTH) { - return false; - } -+ // Spigot start - Null = Remove skin -+ if (name == null) { -+ this.profile = null; -+ return true; -+ } -+ // Spigot end - - if (name == null) { - profile = null; --- -1.9.1 - diff --git a/CraftBukkit-Patches/0142-Fix-race-condition-that-could-kill-connections-befor.patch b/CraftBukkit-Patches/0141-Fix-race-condition-that-could-kill-connections-befor.patch similarity index 97% rename from CraftBukkit-Patches/0142-Fix-race-condition-that-could-kill-connections-befor.patch rename to CraftBukkit-Patches/0141-Fix-race-condition-that-could-kill-connections-befor.patch index 65e584a6d0..03a4182a56 100644 --- a/CraftBukkit-Patches/0142-Fix-race-condition-that-could-kill-connections-befor.patch +++ b/CraftBukkit-Patches/0141-Fix-race-condition-that-could-kill-connections-befor.patch @@ -1,4 +1,4 @@ -From 91faf0e210d3dd7664e66dc46aaace12190e5727 Mon Sep 17 00:00:00 2001 +From 328030d673f12b3a3762f02fe2eb24b5d25bf1ba Mon Sep 17 00:00:00 2001 From: Jonas Konrad Date: Fri, 25 Apr 2014 23:46:46 +0200 Subject: [PATCH] Fix race condition that could kill connections before they @@ -59,5 +59,5 @@ index 1d7b814..981e22c 100644 if (networkmanager.f() != null) { networkmanager.getPacketListener().a(networkmanager.f()); -- -1.8.3.2 +1.9.1