From 5ae4306581f92dc8ca78ebdecf223a7f18784af8 Mon Sep 17 00:00:00 2001 From: Aikar <aikar@aikar.co> Date: Thu, 6 Sep 2018 22:08:35 -0400 Subject: [PATCH] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 632449b6 SPIGOT-4349: End portal has wrong TeleportCause 3eb8af23 SPIGOT-4348: Use online player for setting skull owner if possible --- .../Add-setPlayerProfile-API-for-Skulls.patch | 10 +++++----- .../Use-UserCache-for-player-heads.patch | 2 +- work/CraftBukkit | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Spigot-Server-Patches/Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/Add-setPlayerProfile-API-for-Skulls.patch index 6563f24a4a..81df865aa2 100644 --- a/Spigot-Server-Patches/Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-Server-Patches/Add-setPlayerProfile-API-for-Skulls.patch @@ -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 f113da713a..fdfe101ae3 100644 +index ad7a2dd170..207546f03a 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,16 +18,16 @@ index f113da713a..fdfe101ae3 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.Block; - import org.bukkit.block.BlockFace; +@@ -0,0 +0,0 @@ import org.bukkit.block.BlockFace; import org.bukkit.block.Skull; import org.bukkit.block.data.Rotatable; + import org.bukkit.craftbukkit.entity.CraftPlayer; +import javax.annotation.Nullable; public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implements Skull { @@ -0,0 +0,0 @@ public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implement - this.profile = new GameProfile(player.getUniqueId(), player.getName()); + } } + // Paper start @@ -48,7 +48,7 @@ index f113da713a..fdfe101ae3 100644 public BlockFace getRotation() { return ((Rotatable) getBlockData()).getRotation(); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index 7984c68cb0..14d8dd65ac 100644 +index 2ea2a355ba..398cf958cc 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; diff --git a/Spigot-Server-Patches/Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/Use-UserCache-for-player-heads.patch index 0e8cfcbb07..a6b53381bc 100644 --- a/Spigot-Server-Patches/Use-UserCache-for-player-heads.patch +++ b/Spigot-Server-Patches/Use-UserCache-for-player-heads.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Use UserCache for player heads diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index e5b9310ea..e9e2c1445 100644 +index f1e029d33f..2ea2a355ba 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 @@ import net.minecraft.server.GameProfileSerializer; diff --git a/work/CraftBukkit b/work/CraftBukkit index c88ae6b195..632449b6c4 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit c88ae6b1953fd60b724a2b8e555499b5d0acaa00 +Subproject commit 632449b6c48da3c7c96a430fdb95c1d8b3b873df