SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Upstream (CraftBukkit)

Browse Source 
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
This commit is contained in:
Aikar
2018-09-06 22:08:35 -04:00
parent 3d0c4bd860
commit 5ae4306581
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/Add-setPlayerProfile-API-for-Skulls.patch
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 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 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 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
@@ -18,16 +18,16 @@ index f113da713a..fdfe101ae3 100644
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
@@ -0,0 +0,0 @@ import org.bukkit.block.Block; @@ -0,0 +0,0 @@ import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockFace;
import org.bukkit.block.Skull; import org.bukkit.block.Skull;
import org.bukkit.block.data.Rotatable; import org.bukkit.block.data.Rotatable;
import org.bukkit.craftbukkit.entity.CraftPlayer;
+import javax.annotation.Nullable; +import javax.annotation.Nullable;
public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implements Skull { public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implements Skull {
@@ -0,0 +0,0 @@ public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implement @@ -0,0 +0,0 @@ public class CraftSkull extends CraftBlockEntityState<TileEntitySkull> implement
this.profile = new GameProfile(player.getUniqueId(), player.getName()); }
} }
+ // Paper start + // Paper start
@@ -48,7 +48,7 @@ index f113da713a..fdfe101ae3 100644
public BlockFace getRotation() { public BlockFace getRotation() {
return ((Rotatable) getBlockData()).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 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 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
+++ b/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; @@ -0,0 +0,0 @@ package org.bukkit.craftbukkit.inventory;

2
Spigot-Server-Patches/Use-UserCache-for-player-heads.patch
View File

@@ -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 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 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
+++ b/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; @@ -0,0 +0,0 @@ import net.minecraft.server.GameProfileSerializer;

2
work/CraftBukkit

Submodule work/CraftBukkit updated: c88ae6b195...632449b6c4