Update to Minecraft 1.9

By: md_5 <git@md-5.net>

paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java

@@ -82,6 +82,9 @@ public final class CraftMagicNumbers implements UnsafeValues {
     }
 
     public static Block getBlock(Material material) {
+        if (material == null) {
+            return null;
+        }
         // TODO: Don't use ID
         Block block = Block.getById(material.getId());
 

paper-server/src/main/java/org/bukkit/craftbukkit/util/LazyHashSet.java

@@ -4,7 +4,6 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
 
-
 public abstract class LazyHashSet<E> implements Set<E> {
     Set<E> reference = null;
 

paper-server/src/main/java/org/bukkit/craftbukkit/util/LazyPlayerSet.java

@@ -9,17 +9,22 @@ import org.bukkit.entity.Player;
 
 public class LazyPlayerSet extends LazyHashSet<Player> {
 
+    private final MinecraftServer server;
+
+    public LazyPlayerSet(MinecraftServer server) {
+        this.server = server;
+    }
+
     @Override
     HashSet<Player> makeReference() {
         if (reference != null) {
             throw new IllegalStateException("Reference already created!");
         }
-        List<EntityPlayer> players = MinecraftServer.getServer().getPlayerList().players;
+        List<EntityPlayer> players = server.getPlayerList().players;
         HashSet<Player> reference = new HashSet<Player>(players.size());
         for (EntityPlayer player : players) {
             reference.add(player.getBukkitEntity());
         }
         return reference;
     }
-
 }