1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
index 2f2564f2..0f3e0d8f 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
@@ -148,7 +148,7 @@ public class CraftSkull extends CraftBlockState implements Skull {
     }
 
     public boolean setOwner(String name) {
-        if (name != null && name.length() > MAX_OWNER_LENGTH) {
+        if (name == null || name.length() > MAX_OWNER_LENGTH) {
             return false;
         }
         player = name;
@@ -176,7 +176,7 @@ public class CraftSkull extends CraftBlockState implements Skull {
         this.skullType = skullType;
 
         if (skullType != SkullType.PLAYER) {
-            player = null;
+            player = "";
         }
     }