From 00e1315f65058346ea405565be1844049eb80a5a Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Tue, 3 Feb 2015 17:53:51 -0600
Subject: [PATCH] Rebuild patches for upstream changes

---
 .../Do-not-remove-player-in-world-change.patch              | 4 +---
 Spigot-Server-Patches/Player-lookup-improvements.patch      | 6 ++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Spigot-Server-Patches/Do-not-remove-player-in-world-change.patch b/Spigot-Server-Patches/Do-not-remove-player-in-world-change.patch
index 92109874d6..7ca843f22a 100644
--- a/Spigot-Server-Patches/Do-not-remove-player-in-world-change.patch
+++ b/Spigot-Server-Patches/Do-not-remove-player-in-world-change.patch
@@ -26,6 +26,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              this.f.put(entityplayer1.getUniqueID(), entityplayer1);
          }
          // Added from changeDimension
--- 
-1.9.5.msysgit.0
-
+--
\ 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 a556b8d4e8..c1d3110c7a 100644
--- a/Spigot-Server-Patches/Player-lookup-improvements.patch
+++ b/Spigot-Server-Patches/Player-lookup-improvements.patch
@@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private final IpBanList l;
 @@ -0,0 +0,0 @@ public abstract class PlayerList {
  
-     public void onPlayerJoin(EntityPlayer entityplayer) {
+     public void onPlayerJoin(EntityPlayer entityplayer, String joinMessage) { // CraftBukkit added param
          this.players.add(entityplayer);
 +        this.playerMap.put(entityplayer.getName(), entityplayer); // PaperSpigot
          this.f.put(entityplayer.getUniqueID(), entityplayer);
@@ -170,6 +170,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      public InetSocketAddress getAddress() {
--- 
-1.9.5.msysgit.0
-
+--
\ No newline at end of file