mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-27 23:19:36 +02:00
Remove the "Allow skull owners to be removed" patch as it was fixed upstream
This commit is contained in:
parent
38e8d2b53c
commit
57ffba423f
|
@ -1,26 +0,0 @@
|
|||
From 0b7f5bbb1d880be6abfe53e2b9fc1a412b28b265 Mon Sep 17 00:00:00 2001
|
||||
From: Thinkofdeath <thethinkofdeath@gmail.com>
|
||||
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
|
||||
|
|
@ -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 <me@yawk.at>
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user