Update upstream B/CB/S

This commit is contained in:
Zach Brown
2018-10-27 00:02:22 -04:00
parent 090b025ed3
commit f29440f891
57 changed files with 221 additions and 227 deletions

View File

@@ -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
@@ -0,0 +0,0 @@ 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