diff --git a/Spigot-Server-Patches/0012-Do-not-remove-player-in-world-change.patch b/Spigot-Server-Patches/0012-Do-not-remove-player-in-world-change.patch
index 7109ed73f6..26c344e9c0 100644
--- a/Spigot-Server-Patches/0012-Do-not-remove-player-in-world-change.patch
+++ b/Spigot-Server-Patches/0012-Do-not-remove-player-in-world-change.patch
@@ -1,14 +1,14 @@
-From c656076db1fe048b6cdf6d44901eeba891ee4b6f Mon Sep 17 00:00:00 2001
+From 62b4352fcbd5d30e516fa3f016beaee2bf5b860f Mon Sep 17 00:00:00 2001
 From: T00thpick1 <t00thpick1dirko@gmail.com>
 Date: Fri, 28 Nov 2014 01:25:45 -0600
 Subject: [PATCH] Do not remove player in world change
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 4728192..63fc029 100644
+index 7466eec..9e9bccf 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
-@@ -468,7 +468,7 @@ public abstract class PlayerList {
+@@ -474,7 +474,7 @@ public abstract class PlayerList {
          entityplayer.u().getTracker().untrackPlayer(entityplayer);
          // entityplayer.u().getTracker().untrackEntity(entityplayer); // CraftBukkit
          entityplayer.u().getPlayerChunkMap().removePlayer(entityplayer);
@@ -17,7 +17,7 @@ index 4728192..63fc029 100644
          this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer);
          BlockPosition blockposition = entityplayer.getBed();
          boolean flag1 = entityplayer.isRespawnForced();
-@@ -562,7 +562,7 @@ public abstract class PlayerList {
+@@ -568,7 +568,7 @@ public abstract class PlayerList {
          if (!entityplayer.playerConnection.isDisconnected()) {
              worldserver.getPlayerChunkMap().addPlayer(entityplayer1);
              worldserver.addEntity(entityplayer1);
diff --git a/Spigot-Server-Patches/0034-Player-lookup-improvements.patch b/Spigot-Server-Patches/0034-Player-lookup-improvements.patch
index 24297fa64e..a5ed7406e9 100644
--- a/Spigot-Server-Patches/0034-Player-lookup-improvements.patch
+++ b/Spigot-Server-Patches/0034-Player-lookup-improvements.patch
@@ -1,4 +1,4 @@
-From 11019ca48ca7b1da8d1d45a843eeb9476d947f0c Mon Sep 17 00:00:00 2001
+From af4ebcf09a2982aea9de423e717a3868b25effea Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Nov 2014 13:43:11 -0600
 Subject: [PATCH] Player lookup improvements
@@ -13,7 +13,7 @@ By using a map based approach for player lookups, player lookup should
 be consistent in performance regardless of how many players are online.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 63fc029..62bdb70 100644
+index 9e9bccf..535e43b 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -49,6 +49,31 @@ public abstract class PlayerList {
@@ -48,7 +48,7 @@ index 63fc029..62bdb70 100644
      public final Map f = Maps.newHashMap();
      private final GameProfileBanList k;
      private final IpBanList l;
-@@ -257,6 +282,7 @@ public abstract class PlayerList {
+@@ -263,6 +288,7 @@ public abstract class PlayerList {
  
      public void onPlayerJoin(EntityPlayer entityplayer, String joinMessage) { // CraftBukkit added param
          this.players.add(entityplayer);
@@ -56,7 +56,7 @@ index 63fc029..62bdb70 100644
          this.f.put(entityplayer.getUniqueID(), entityplayer);
          // this.sendAll(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer})); // CraftBukkit - replaced with loop below
          WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);
-@@ -328,6 +354,7 @@ public abstract class PlayerList {
+@@ -334,6 +360,7 @@ public abstract class PlayerList {
          worldserver.kill(entityplayer);
          worldserver.getPlayerChunkMap().removePlayer(entityplayer);
          this.players.remove(entityplayer);
@@ -64,7 +64,7 @@ index 63fc029..62bdb70 100644
          this.f.remove(entityplayer.getUniqueID());
          this.o.remove(entityplayer.getUniqueID());
          // CraftBukkit start
-@@ -359,6 +386,8 @@ public abstract class PlayerList {
+@@ -365,6 +392,8 @@ public abstract class PlayerList {
  
          EntityPlayer entityplayer;
  
@@ -73,7 +73,7 @@ index 63fc029..62bdb70 100644
          for (int i = 0; i < this.players.size(); ++i) {
              entityplayer = (EntityPlayer) this.players.get(i);
              if (entityplayer.getUniqueID().equals(uuid)) {
-@@ -370,6 +399,8 @@ public abstract class PlayerList {
+@@ -376,6 +405,8 @@ public abstract class PlayerList {
  
          while (iterator.hasNext()) {
              entityplayer = (EntityPlayer) iterator.next();
@@ -82,7 +82,7 @@ index 63fc029..62bdb70 100644
              savePlayerFile(entityplayer); // CraftBukkit - Force the player's inventory to be saved
              entityplayer.playerConnection.disconnect("You logged in from another location");
          }
-@@ -961,6 +992,7 @@ public abstract class PlayerList {
+@@ -967,6 +998,7 @@ public abstract class PlayerList {
      }
  
      public EntityPlayer getPlayer(String s) {