aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch')
-rw-r--r--Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch
index 00edadbf7c..fbcb0667d2 100644
--- a/Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch
+++ b/Spigot-Server-Patches/0228-Add-setPlayerProfile-API-for-Skulls.patch
@@ -1,4 +1,4 @@
-From 9a871f17c9a198eb5bc9b74e789ea310e2fca616 Mon Sep 17 00:00:00 2001
+From fcf7838985692e85f2b8dc0451b53c608c21e454 Mon Sep 17 00:00:00 2001
From: Aikar <[email protected]>
Date: Fri, 19 Jan 2018 00:36:25 -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/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
@@ -1,5 +1,7 @@
@@ -18,15 +18,15 @@ index ad7a2dd170..207546f03a 100644
import com.google.common.base.Preconditions;
import com.mojang.authlib.GameProfile;
import net.minecraft.server.MinecraftServer;
-@@ -14,6 +16,7 @@ import org.bukkit.block.BlockFace;
- import org.bukkit.block.Skull;
+@@ -16,6 +18,7 @@ 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;
public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implements Skull {
-@@ -104,6 +107,20 @@ public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implement
+@@ -106,6 +109,20 @@ public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implement
}
}
@@ -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
@@ -2,6 +2,8 @@ package org.bukkit.craftbukkit.inventory;
@@ -90,5 +90,5 @@ index 2ea2a355ba..398cf958cc 100644
public OfflinePlayer getOwningPlayer() {
if (hasOwner()) {
--
-2.19.0
+2.19.1