Update upstream B/CB/S
This commit is contained in:
@@ -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/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
|
||||
index ad7a2dd170..207546f03a 100644
|
||||
index 110e04597..c260af11c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
|
||||
@@ -0,0 +0,0 @@
|
||||
@@ -18,8 +18,8 @@ index ad7a2dd170..207546f03a 100644
|
||||
import com.google.common.base.Preconditions;
|
||||
import com.mojang.authlib.GameProfile;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
@@ -0,0 +0,0 @@ import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.block.Skull;
|
||||
@@ -0,0 +0,0 @@ import org.bukkit.block.data.BlockData;
|
||||
import org.bukkit.block.data.Directional;
|
||||
import org.bukkit.block.data.Rotatable;
|
||||
import org.bukkit.craftbukkit.entity.CraftPlayer;
|
||||
+import javax.annotation.Nullable;
|
||||
@@ -46,9 +46,9 @@ index ad7a2dd170..207546f03a 100644
|
||||
+
|
||||
@Override
|
||||
public BlockFace getRotation() {
|
||||
return ((Rotatable) getBlockData()).getRotation();
|
||||
BlockData blockData = getBlockData();
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
||||
index 2ea2a355ba..398cf958cc 100644
|
||||
index 2ea2a355b..398cf958c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
|
||||
@@ -0,0 +0,0 @@ package org.bukkit.craftbukkit.inventory;
|
||||
|
||||
Reference in New Issue
Block a user