Update Upstream

This commit is contained in:
Spottedleaf 2019-05-05 19:58:04 -07:00
parent cb24079b77
commit eeb2ecd789
348 changed files with 1661 additions and 1710 deletions

View file

@ -1,4 +1,4 @@
From 35a4d7387a22fe69f696b54ea874cb44d6f77a06 Mon Sep 17 00:00:00 2001
From 17f04473ae82c2ae90cca24a5f7fce0bbb5855e8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 19 Jan 2018 00:29:28 -0500
Subject: [PATCH] Add setPlayerProfile API for Skulls
@ -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/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java
index 6325f583..27675ecd 100644
index 943d751f..a6914f01 100644
--- a/src/main/java/org/bukkit/block/Skull.java
+++ b/src/main/java/org/bukkit/block/Skull.java
@@ -7,6 +7,7 @@ import org.bukkit.block.data.BlockData;
@ -18,7 +18,7 @@ index 6325f583..27675ecd 100644
/**
* Represents a captured state of a skull block.
@@ -61,6 +62,20 @@ public interface Skull extends BlockState {
@@ -61,6 +62,20 @@ public interface Skull extends TileState {
*/
public void setOwningPlayer(@NotNull OfflinePlayer player);
@ -40,7 +40,7 @@ index 6325f583..27675ecd 100644
* Gets the rotation of the skull in the world (or facing direction if this
* is a wall mounted skull).
diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
index 1583764b..43cdc4c6 100644
index 35a39203..8b2465ea 100644
--- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
@@ -1,9 +1,11 @@