Update upstream

This commit is contained in:
Aikar
2018-07-23 18:57:54 -04:00
parent 4608731dca
commit 9a17bddf12
16 changed files with 70 additions and 70 deletions

View File

@@ -1,4 +1,4 @@
From ca32eb428518822c63a80eaee3602dad31fea886 Mon Sep 17 00:00:00 2001
From 5419d733dfcb2453954fa596166dd20e45ca00ef Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 19 Jan 2018 00:36:25 -0500
Subject: [PATCH] Add SkullMeta.setPlayerProfile API
@@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
which commonly cause rate limit issues with Mojang API
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
index 52de1439e7..960ae59ae1 100644
index e9e2c1445..d894fadef 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
@@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.inventory;
@@ -28,7 +28,7 @@ index 52de1439e7..960ae59ae1 100644
@DelegateDeserialization(SerializableMeta.class)
class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
@@ -131,6 +135,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
@@ -130,6 +134,19 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
return hasOwner() ? profile.getName() : null;
}