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

Update to Minecraft 1.8.3

Browse Source
This commit is contained in:
Thinkofdeath
2015-02-28 11:36:22 +00:00
parent 0d6db011bc
commit c0638b6ffb
107 changed files with 1670 additions and 2431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
CraftBukkit-Patches/0113-Convert-player-skulls-async.patch
View File

@@ -33,10 +33,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
return true;
} else {
return false;
}
}
-
}
diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/TileEntitySkull.java
@@ -56,12 +52,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.mojang.authlib.Agent;
+import com.mojang.authlib.ProfileLookupCallback;
+// Spigot end
+
public class TileEntitySkull extends TileEntity {
private int a;
public int rotation;
private int rotation;
private GameProfile g = null;
+ // Spigot start
+ public static final Executor executor = Executors.newFixedThreadPool(3,
@@ -77,8 +74,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ @Override
+ public GameProfile load(String key) throws Exception
+ {
+ GameProfile[] profiles = new GameProfile[1];
+ GameProfileLookup gameProfileLookup = new GameProfileLookup(profiles);
+ final GameProfile[] profiles = new GameProfile[1];
+ ProfileLookupCallback gameProfileLookup = new ProfileLookupCallback() {
+
+ @Override
+ public void onProfileLookupSucceeded(GameProfile gp) {
+ profiles[0] = gp;
+ }
+
+ @Override
+ public void onProfileLookupFailed(GameProfile gp, Exception excptn) {
+ profiles[0] = gp;
+ }
+ };
+
+ MinecraftServer.getServer().getGameProfileRepository().findProfilesByNames(new String[] { key }, Agent.MINECRAFT, gameProfileLookup);
+
@@ -95,7 +103,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+ if ( property == null )
+ {
+ profile = MinecraftServer.getServer().aB().fillProfileProperties( profile, true );
+ profile = MinecraftServer.getServer().aC().fillProfileProperties( profile, true );
+ }
+ }
+
@@ -153,10 +161,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ callback.apply(profile);
} else {
- Property property = (Property) Iterables.getFirst(gameprofile1.getProperties().get("textures"), (Object) null);
-
+ Property property = (Property) Iterables.getFirst(profile.getProperties().get("textures"), (Object) null);
- if (property == null) {
- gameprofile1 = MinecraftServer.getServer().aB().fillProfileProperties(gameprofile1, true);
- }
- gameprofile1 = MinecraftServer.getServer().aC().fillProfileProperties(gameprofile1, true);
+ if (property != null) {
+ callback.apply(profile);
+ return;
}
-
- return gameprofile1;
+ executor.execute(new Runnable() {