Commits
md_5 authored 9797151286c
| 1 - | From aeaf492ed61cd07203fc67f3a6d38075ca289c13 Mon Sep 17 00:00:00 2001 |
| 1 + | From 4b43081b9becc0c7615ceee425e86efa97051880 Mon Sep 17 00:00:00 2001 |
| 2 2 | From: Thinkofdeath <thethinkofdeath@gmail.com> |
| 3 3 | Date: Sun, 20 Apr 2014 13:18:55 +0100 |
| 4 4 | Subject: [PATCH] Convert player skulls async |
| 5 5 | |
| 6 6 | |
| 7 7 | diff --git a/src/main/java/net/minecraft/server/ItemSkull.java b/src/main/java/net/minecraft/server/ItemSkull.java |
| 8 - | index 4833541..213221f 100644 |
| 8 + | index 93421e9..48c5f7e 100644 |
| 9 9 | --- a/src/main/java/net/minecraft/server/ItemSkull.java |
| 10 10 | +++ b/src/main/java/net/minecraft/server/ItemSkull.java |
| 11 11 | |
| 12 12 | return super.a(itemstack); |
| 13 13 | } |
| 14 14 | |
| 15 15 | - public boolean a(NBTTagCompound nbttagcompound) { |
| 16 16 | + public boolean a(final NBTTagCompound nbttagcompound) { // Spigot - make final |
| 17 17 | super.a(nbttagcompound); |
| 18 18 | if (nbttagcompound.hasKeyOfType("SkullOwner", 8) && !nbttagcompound.getString("SkullOwner").isEmpty()) { |
| 25 25 | + |
| 26 26 | + @Override |
| 27 27 | + public boolean apply(GameProfile gameprofile) { |
| 28 28 | + nbttagcompound.set("SkullOwner", GameProfileSerializer.serialize(new NBTTagCompound(), gameprofile)); |
| 29 29 | + return false; |
| 30 30 | + } |
| 31 31 | + }); |
| 32 32 | + // Spigot end |
| 33 33 | return true; |
| 34 34 | } else { |
| 35 - | nbttagcompound.remove("SkullOwner"); // CraftBukkit - remove broken skulls |
| 35 + | // CraftBukkit start |
| 36 36 | diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java |
| 37 37 | index 4ae6796..654b51d 100644 |
| 38 38 | --- a/src/main/java/net/minecraft/server/TileEntitySkull.java |
| 39 39 | +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java |
| 40 40 | |
| 41 41 | import java.util.UUID; |
| 42 42 | import javax.annotation.Nullable; |
| 43 43 | |
| 44 44 | +// Spigot start |
| 45 45 | +import com.google.common.base.Predicate; |