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

Upstream merge: possibly fix some head related bugs.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-05-04 10:22:14 +10:00
parent 70c8ad6011
commit 50fd4d27f1
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CraftBukkit

Submodule CraftBukkit updated: d550f2fc83...43d894348e

8
CraftBukkit-Patches/0141-Allow-skull-owners-to-be-removed.patch
View File

@@ -1,11 +1,11 @@
From 3198cb0e2bcba88fd3d5c74865993894c564e6d8 Mon Sep 17 00:00:00 2001 From 0b7f5bbb1d880be6abfe53e2b9fc1a412b28b265 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com> From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 30 Apr 2014 12:50:19 +0100 Date: Wed, 30 Apr 2014 12:50:19 +0100
Subject: [PATCH] Allow skull owners to be removed Subject: [PATCH] Allow skull owners to be removed
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 15e114d..247fef9 100644 index 2fe1000..55d1ccf 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
@@ -92,6 +92,12 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { @@ -92,6 +92,12 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta {
@@ -19,8 +19,8 @@ index 15e114d..247fef9 100644
+ } + }
+ // Spigot end + // Spigot end
GameProfile profile = MinecraftServer.getServer().getUserCache().a(name); if (name == null) {
if (profile == null) { profile = null;
-- --
1.9.1 1.9.1