Upstream merge: possibly fix some head related bugs.
By: md_5 <git@md-5.net>
This commit is contained in:
Submodule CraftBukkit updated: d550f2fc83...43d894348e
@@ -1,11 +1,11 @@
|
||||
From 3198cb0e2bcba88fd3d5c74865993894c564e6d8 Mon Sep 17 00:00:00 2001
|
||||
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 15e114d..247fef9 100644
|
||||
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 {
|
||||
@@ -19,8 +19,8 @@ index 15e114d..247fef9 100644
|
||||
+ }
|
||||
+ // Spigot end
|
||||
|
||||
GameProfile profile = MinecraftServer.getServer().getUserCache().a(name);
|
||||
if (profile == null) {
|
||||
if (name == null) {
|
||||
profile = null;
|
||||
--
|
||||
1.9.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user