Update upstream CB

6 files changed, 26 insertions, 26 deletions

diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch
index a619fa78aa..9718441732 100644
--- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch
@@ -1,4 +1,4 @@
-From b9ed456c56c03fd801daea418dc35ec4d8a0a2cb Mon Sep 17 00:00:00 2001
+From d40440cebea4465e17477fd5e9fbbdc815a06c4a Mon Sep 17 00:00:00 2001
 From: DoctorDark <[email protected]>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
@@ -20,7 +20,7 @@ index fd606ee14..c00fa83d5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index b311903fb..378057e85 100644
+index 4b9e83161..7c8c61ee8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -513,6 +513,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -38,8 +38,8 @@ index b311903fb..378057e85 100644
 +
      @Nullable
      public Entity c(int i) {
-         // this.worldChangeInvuln = true; // CraftBukkit - Moved down and into PlayerList#changeDimension
-@@ -521,7 +530,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+         if (this.isSleeping()) return this; // CraftBukkit - SPIGOT-3154
+@@ -522,7 +531,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.world.kill(this);
              if (!this.viewingCredits) {
                  this.viewingCredits = true;
@@ -52,5 +52,5 @@ index b311903fb..378057e85 100644
                  } else {
                      this.b((Statistic) AchievementList.D);
 -- 
-2.12.0.windows.1
+2.12.1.windows.1
 
diff --git a/Spigot-Server-Patches/0121-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0121-Implement-PlayerLocaleChangeEvent.patch
index 666052c363..90b609de4a 100644
--- a/Spigot-Server-Patches/0121-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0121-Implement-PlayerLocaleChangeEvent.patch
@@ -1,11 +1,11 @@
-From 26e1ed0356b858d55a7bbad90ab7e8e0f835b8ab Mon Sep 17 00:00:00 2001
+From 7c5c9f54197be368f4de6333591de92a2c03e239 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <[email protected]>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index d0e1de48a..80b313b47 100644
+index 7ec504730..cfdff768f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -29,7 +29,7 @@ import org.bukkit.inventory.MainHand;
@@ -17,7 +17,7 @@ index d0e1de48a..80b313b47 100644
      public PlayerConnection playerConnection;
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
-@@ -1092,7 +1092,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1093,7 +1093,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.server.server.getPluginManager().callEvent(event);
          }
          // CraftBukkit end
@@ -50,5 +50,5 @@ index a74d6c768..a2fb7d2be 100644
  
          @Override
 -- 
-2.12.0.windows.1
+2.12.1.windows.1
 
diff --git a/Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch
index 21bcb6cb69..950a1642f0 100644
--- a/Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch
@@ -1,14 +1,14 @@
-From 8fa8ea1454de05471873e81d8a6c806720b143f0 Mon Sep 17 00:00:00 2001
+From 88f7bde20a7c6a5478b3a64d5761543945318e41 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 80b313b47..93c4babd9 100644
+index cfdff768f..5753f5b97 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -650,6 +650,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -651,6 +651,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (entity1 != entity && this.playerConnection != null) {
              this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
          }
@@ -23,5 +23,5 @@ index 80b313b47..93c4babd9 100644
      }
  
 -- 
-2.12.0.windows.1
+2.12.1.windows.1
 
diff --git a/Spigot-Server-Patches/0174-Optimise-removeQueue.patch b/Spigot-Server-Patches/0174-Optimise-removeQueue.patch
index ff9a5a223f..5ae448ab26 100644
--- a/Spigot-Server-Patches/0174-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0174-Optimise-removeQueue.patch
@@ -1,11 +1,11 @@
-From 812cbc220dbd54319a06cb73cb47b38a4871221e Mon Sep 17 00:00:00 2001
+From 4b6c877be1c3f82fe7502f8be28367b47de0ef6d Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4da83a1bf..a7a71242e 100644
+index 0d73fc4cf..ea140f715 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
@@ -46,7 +46,7 @@ index 4da83a1bf..a7a71242e 100644
  
              this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
          }
-@@ -991,7 +1000,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -992,7 +1001,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.lastSentExp = -1;
          this.lastHealthSent = -1.0F;
          this.cc = -1;
@@ -61,5 +61,5 @@ index 4da83a1bf..a7a71242e 100644
  
      protected void a(MobEffect mobeffect) {
 -- 
-2.12.0.windows.1
+2.12.1.windows.1
 
diff --git a/Spigot-Server-Patches/0191-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0191-Properly-fix-item-duplication-bug.patch
index 6c91401202..1ce64fc65f 100644
--- a/Spigot-Server-Patches/0191-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0191-Properly-fix-item-duplication-bug.patch
@@ -1,4 +1,4 @@
-From 2a7b019048cb66dd8fc16d2bdc6eda07a8acfaef Mon Sep 17 00:00:00 2001
+From 45e06ece3de8a6cbb446c94ca66b8347324ea0ab Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <[email protected]>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a7a71242e..3147f4a08 100644
+index ea140f715..7bc7991eb 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1333,7 +1333,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1334,7 +1334,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      protected boolean isFrozen() {
@@ -31,5 +31,5 @@ index 9214c5594..964de593b 100644
      }
  }
 -- 
-2.12.0.windows.1
+2.12.1.windows.1
 
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject d09304e5db889f233abc5e57416119d131af083
+Subproject 7dd77d7340d2bcc1ebab5ab0b0b60e8fb3e0add