Update upstream B/CB/S
This commit is contained in:
parent
b1ab9ad452
commit
c4865a6445
57 changed files with 380 additions and 386 deletions
|
@ -1,4 +1,4 @@
|
|||
From 55e3e61db93e7dba8a19a6f2094fccf3b2fcab2f Mon Sep 17 00:00:00 2001
|
||||
From 5dbcfd053603e67423074aaa91dd327e6dca7a60 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 92363d33..b83df2f7 100644
|
||||
index 499a153e..3c75341e 100644
|
||||
--- a/src/main/java/org/bukkit/block/Skull.java
|
||||
+++ b/src/main/java/org/bukkit/block/Skull.java
|
||||
@@ -4,6 +4,8 @@ import org.bukkit.Material;
|
||||
|
@ -38,8 +38,8 @@ index 92363d33..b83df2f7 100644
|
|||
+ // Paper end
|
||||
+
|
||||
/**
|
||||
* Gets the rotation of the skull in the world
|
||||
*
|
||||
* 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 15c1dfd9..a458000f 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
|
||||
|
@ -77,5 +77,5 @@ index 15c1dfd9..a458000f 100644
|
|||
* Gets the owner of the skull.
|
||||
*
|
||||
--
|
||||
2.16.1.windows.1
|
||||
2.19.1
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue