Fix supporting more places of the old UUID format

Fixes #3734

Spigot-Server-Patches/Fix-client-rendering-skulls-from-same-user.patch

@@ -39,8 +39,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                // Paper start
 +                if (nbttagcompound != null && nbttagcompound.hasKeyOfType("SkullOwner", 10)) {
 +                    NBTTagCompound owner = nbttagcompound.getCompound("SkullOwner");
-+                    if (owner.hasKey("Id")) {
++                    if (owner.hasUUID("Id")) {
-+                        nbttagcompound.map.put("SkullOwnerOrig", owner.map.get("Id"));
++                        nbttagcompound.setUUID("SkullOwnerOrig", owner.getUUID("Id"));
 +                        TileEntitySkull.sanitizeUUID(owner);
 +                    }
 +                }

Spigot-Server-Patches/Support-old-UUID-format-for-NBT.patch

@@ -23,3 +23,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return GameProfileSerializer.a(this.get(s));
      }
  
+     public final boolean hasUUID(String s) { return this.b(s); } // Paper - OBFHELPER
+     public boolean b(String s) {
++        // Paper start - support old format
++        if (hasKey(s + "Least") && hasKey(s + "Most")) {
++            return true;
++        }
++        // Paper end
+         NBTBase nbtbase = this.get(s);
+ 
+         return nbtbase != null && nbtbase.b() == NBTTagIntArray.a && ((NBTTagIntArray) nbtbase).getInts().length == 4;