From 1e81634a9d99326a29a37d021d028a9a592e5c5d Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sun, 4 Jan 2015 20:01:24 -0600
Subject: [PATCH] Update from upstream SpigotMC eb39b4729ce 59b08be5833
 a723278f74a

---
 .../0014-Add-Getter-for-Entity-Invulnerability.patch       | 2 +-
 .../0003-Skeleton-API-Implementations.patch                | 4 ++--
 CraftBukkit-Patches/0016-Metrics.patch                     | 1 -
 .../0068-Allow-statistics-to-be-disabled-forced.patch      | 7 -------
 CraftBukkit-Patches/0113-Convert-player-skulls-async.patch | 4 +++-
 CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch   | 7 -------
 6 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch b/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch
index 8377632c3f..87039fd82a 100644
--- a/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch
+++ b/Bukkit-Patches/0014-Add-Getter-for-Entity-Invulnerability.patch
@@ -8,7 +8,7 @@ diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/buk
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -0,0 +0,0 @@ public interface Entity extends Metadatable {
+@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender {
       * @return if the custom name is displayed
       */
      public boolean isCustomNameVisible();
diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
index f937bdb419..dbf081a2d2 100644
--- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
@@ -68,8 +68,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
-     public boolean isCustomNameVisible() {
-         return getHandle().getCustomNameVisible();
+     public void setOp(boolean value) {
+         perm.setOp(value);
      }
 +
 +    // Spigot start
diff --git a/CraftBukkit-Patches/0016-Metrics.patch b/CraftBukkit-Patches/0016-Metrics.patch
index caed577105..29976c881b 100644
--- a/CraftBukkit-Patches/0016-Metrics.patch
+++ b/CraftBukkit-Patches/0016-Metrics.patch
@@ -655,7 +655,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
 +}
-\ No newline at end of file
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
diff --git a/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch
index 5c2f96f622..e66bd7192f 100644
--- a/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch
+++ b/CraftBukkit-Patches/0068-Allow-statistics-to-be-disabled-forced.patch
@@ -39,13 +39,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          int j = statistic.d() ? this.getStatisticValue(statistic) : 0;
  
          super.setStatistic(entityhuman, statistic, i);
-@@ -0,0 +0,0 @@ public class ServerStatisticManager extends StatisticManager {
-         return this.g;
-     }
- 
--}
-+}
-\ No newline at end of file
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
diff --git a/CraftBukkit-Patches/0113-Convert-player-skulls-async.patch b/CraftBukkit-Patches/0113-Convert-player-skulls-async.patch
index 070b8109ff..7cb066ae13 100644
--- a/CraftBukkit-Patches/0113-Convert-player-skulls-async.patch
+++ b/CraftBukkit-Patches/0113-Convert-player-skulls-async.patch
@@ -124,7 +124,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                setSkullType( 3 ); // Work around client bug
 +                g = input;
 +                update();
-+                world.notify(position);
++                if (world != null) {
++                    world.notify(position);
++                }
 +                return false;
 +            }
 +        }); 
diff --git a/CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch b/CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch
index 79a312bd81..14465103dd 100644
--- a/CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch
+++ b/CraftBukkit-Patches/0146-Plug-WorldMap-Memory-Leak.patch
@@ -17,13 +17,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private Map d = Maps.newHashMap();
  
      public PersistentCollection(IDataManager idatamanager) {
-@@ -0,0 +0,0 @@ public class PersistentCollection {
-             return oshort.shortValue();
-         }
-     }
--}
-+}
-\ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/World.java