From 1cab5e5edc6b32fac8c42bf94568f1c8d1b8a8e6 Mon Sep 17 00:00:00 2001
From: Travis Watkins <amaranth@ubuntu.com>
Date: Thu, 17 Apr 2014 08:40:04 -0500
Subject: Revert additions to skull BlockState API from 1.7.8

---
 src/main/java/org/bukkit/block/Skull.java | 37 +++++--------------------------
 1 file changed, 6 insertions(+), 31 deletions(-)

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java
index e0f9fd3c..4f4896f8 100644
--- a/src/main/java/org/bukkit/block/Skull.java
+++ b/src/main/java/org/bukkit/block/Skull.java
@@ -1,10 +1,7 @@
 package org.bukkit.block;
 
-import org.bukkit.OfflinePlayer;
 import org.bukkit.SkullType;
 
-import java.util.UUID;
-
 /**
  * Represents a Skull
  */
@@ -18,45 +15,23 @@ public interface Skull extends BlockState {
     public boolean hasOwner();
 
     /**
-     * Gets the owner of the skull
+     * Gets the owner of the skull, if one exists
      *
-     * @return the owner of the skull or null if the profile does not have a name
-     * @deprecated Skulls no longer store player names, they store profiles
-     * @see #getPlayer()
+     * @return the owner of the skull or null if the skull does not have an owner
      */
-    @Deprecated
     public String getOwner();
 
     /**
-     * Does nothing
+     * Sets the owner of the skull
+     * <p>
+     * Involves a potentially blocking web request to acquire the profile data for
+     * the provided name.
      *
      * @param name the new owner of the skull
      * @return true if the owner was successfully set
-     * @deprecated Skulls no longer store player names, they store profiles
-     * @see #setPlayer(org.bukkit.OfflinePlayer)
      */
-    @Deprecated
     public boolean setOwner(String name);
 
-    /**
-     * Gets the owner of the skull, if one exists
-     *
-     * @return the owner of the skull or null if this skull does not have an owner
-     */
-    public OfflinePlayer getPlayer();
-
-    /**
-     * Sets the owner of the skull to this player
-     * <p>
-     * If the owner does not contain all the needed data for the skull a call to
-     * {@link #update()} may potentially involve a blocking web request to acquire
-     * the missing data.
-     *
-     * @param player the new owner of the skull
-     * @return true if the owner was successfully set
-     */
-    public boolean setPlayer(OfflinePlayer player);
-
     /**
      * Gets the rotation of the skull in the world
      *
-- 
cgit v1.2.3