OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update upstream CB/S

Browse source
This commit is contained in:
Zach Brown 2017-04-22 17:41:28 -05:00
parent f9282c890d
commit f68b2ab95e
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Spigot-Server-Patches/0044-Use-UserCache-for-player-heads.patch
View file

@ -1,11 +1,11 @@
From 526ed5df91f1b0ca392b4707f6aa7a8384c27acd Mon Sep 17 00:00:00 2001 From bf24caf82339d24a9c4a6fd4ef31cdb3c7496d1b Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com> From: Techcable <Techcable@outlook.com>
Date: Wed, 2 Mar 2016 23:42:37 -0600 Date: Wed, 2 Mar 2016 23:42:37 -0600
Subject: [PATCH] Use UserCache for player heads 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 f07eb2f75..18cc74639 100644 index c0c4f8e7d..8c81544f0 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
@@ -6,6 +6,7 @@ import net.minecraft.server.GameProfileSerializer; @@ -6,6 +6,7 @@ import net.minecraft.server.GameProfileSerializer;
@ -16,7 +16,7 @@ index f07eb2f75..18cc74639 100644
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.configuration.serialization.DelegateDeserialization; import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -133,8 +134,12 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { @@ -134,8 +135,12 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
if (name == null) { if (name == null) {
profile = null; profile = null;
} else { } else {

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 7b044defc0a7ab4dbf5fe22cdf3d885ce5de7572 Subproject commit c19c2932bf14b62a6d31266c8ccd9003bfe05e91

2
work/Spigot

@ -1 +1 @@
Subproject commit 54ec0b8b502d298334e7011c0a5065777e22421b Subproject commit 9ba269b5ea33a2a71a58a011f514801e6cb1afc7