From a29fda12b6848b04a870215aac6da9ed6af4d6b7 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Sat, 6 Jun 2015 12:15:22 -0500 Subject: [PATCH] Rebuild patches --- Spigot-Server-Patches/Add-ArmorStand-Marker-NBT-API.patch | 4 +--- Spigot-Server-Patches/Player-affects-spawning-API.patch | 4 +--- Spigot-Server-Patches/Player-lookup-improvements.patch | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Spigot-Server-Patches/Add-ArmorStand-Marker-NBT-API.patch b/Spigot-Server-Patches/Add-ArmorStand-Marker-NBT-API.patch index 663ebdd22c..ae208ea4f9 100644 --- a/Spigot-Server-Patches/Add-ArmorStand-Marker-NBT-API.patch +++ b/Spigot-Server-Patches/Add-ArmorStand-Marker-NBT-API.patch @@ -47,6 +47,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // PaperSpigot end } --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Player-affects-spawning-API.patch b/Spigot-Server-Patches/Player-affects-spawning-API.patch index 4c9942f655..fb12448c50 100644 --- a/Spigot-Server-Patches/Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/Player-affects-spawning-API.patch @@ -197,6 +197,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 }; public Player.Spigot spigot() --- -1.9.5.msysgit.1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Player-lookup-improvements.patch b/Spigot-Server-Patches/Player-lookup-improvements.patch index 5aecbd5e4f..4111f0f17e 100644 --- a/Spigot-Server-Patches/Player-lookup-improvements.patch +++ b/Spigot-Server-Patches/Player-lookup-improvements.patch @@ -19,7 +19,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public abstract class PlayerList { private static final SimpleDateFormat g = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z"); private final MinecraftServer server; - public final List players = new java.util.concurrent.CopyOnWriteArrayList(); // CraftBukkit - ArrayList -> CopyOnWriteArrayList: Iterator safety, public + public final List players = new java.util.concurrent.CopyOnWriteArrayList(); // CraftBukkit - ArrayList -> CopyOnWriteArrayList: Iterator safety + // PaperSpigot start - Player lookup improvements + public final Map playerMap = new java.util.HashMap() { + @Override