Update upstreams

6 files changed, 28 insertions, 27 deletions

diff --git a/Spigot-Server-Patches/0033-Configurable-end-credits.patch b/Spigot-Server-Patches/0033-Configurable-end-credits.patch
index d2beeec5b3..aee775b048 100644
--- a/Spigot-Server-Patches/0033-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0033-Configurable-end-credits.patch
@@ -1,4 +1,4 @@
-From bbd9db10725d0e0bfb9ed3bd9252636585728e72 Mon Sep 17 00:00:00 2001
+From ab28b5b8b3375defb1293a777672f76a17d9fddb 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,10 +20,10 @@ index 158db3a..e4e5487 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a54f09c..48376e8 100644
+index d0cd588..7ef3f62 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -504,6 +504,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -506,6 +506,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          return this.world.pvpMode;
      }
  
@@ -39,7 +39,7 @@ index a54f09c..48376e8 100644
      @Nullable
      public Entity c(int i) {
          //this.ck = true; // CraftBukkit - Moved down and into PlayerList#changeDimension
-@@ -512,7 +521,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -514,7 +523,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.world.kill(this);
              if (!this.viewingCredits) {
                  this.viewingCredits = true;
@@ -52,5 +52,5 @@ index a54f09c..48376e8 100644
                  } else {
                      this.b((Statistic) AchievementList.D);
 -- 
-2.8.2
+2.8.2.windows.1
 
diff --git a/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch
index ee574b69fe..edfcedd5fb 100644
--- a/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0040-Add-player-view-distance-API.patch
@@ -1,14 +1,14 @@
-From 515d4a8639a67827a06af6b0d6d8dacb9f19d653 Mon Sep 17 00:00:00 2001
+From 6f5ba9138ecbe420a790519709c60850d4e89caa Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 48376e8..032c514 100644
+index 7ef3f62..6e19244 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -54,6 +54,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -56,6 +56,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      public boolean f;
      public int ping;
      public boolean viewingCredits;
@@ -114,5 +114,5 @@ index 5515958..9770c99 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.8.2
+2.8.2.windows.1
 
diff --git a/Spigot-Server-Patches/0047-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0047-Configurable-container-update-tick-rate.patch
index 5839efd22f..aa5fa768d1 100644
--- a/Spigot-Server-Patches/0047-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0047-Configurable-container-update-tick-rate.patch
@@ -1,4 +1,4 @@
-From 43f512a084a306bc3fd86a259ad91b180f84c294 Mon Sep 17 00:00:00 2001
+From 4019ce9acbe746b7de1f60f5dc970a23cb17b870 Mon Sep 17 00:00:00 2001
 From: Sudzzy <[email protected]>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
@@ -19,10 +19,10 @@ index 5a139e2..e182e48 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 032c514..723d40c 100644
+index 6e19244..1e33838 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -63,6 +63,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -65,6 +65,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.viewDistance = viewDistance;
      }
      // Paper end
@@ -30,7 +30,7 @@ index 032c514..723d40c 100644
  
      // CraftBukkit start
      public String displayName;
-@@ -208,7 +209,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -210,7 +211,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              --this.noDamageTicks;
          }
  
@@ -45,5 +45,5 @@ index 032c514..723d40c 100644
              this.closeInventory();
              this.activeContainer = this.defaultContainer;
 -- 
-2.8.2
+2.8.2.windows.1
 
diff --git a/Spigot-Server-Patches/0136-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0136-Implement-PlayerLocaleChangeEvent.patch
index 14e248056a..7540bd974d 100644
--- a/Spigot-Server-Patches/0136-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0136-Implement-PlayerLocaleChangeEvent.patch
@@ -1,14 +1,14 @@
-From 94406909cbd42e589bd2380c3de9d308fa53c9df Mon Sep 17 00:00:00 2001
+From 52c5da4d03245903fa490ffa651949b9500f3bf1 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 723d40c..44df116 100644
+index 1e33838..8810016 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -26,7 +26,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
+@@ -28,7 +28,7 @@ import org.bukkit.inventory.MainHand;
  public class EntityPlayer extends EntityHuman implements ICrafting {
  
      private static final Logger bR = LogManager.getLogger();
@@ -17,10 +17,11 @@ index 723d40c..44df116 100644
      public PlayerConnection playerConnection;
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
-@@ -1073,7 +1073,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
-     }
- 
-     public void a(PacketPlayInSettings packetplayinsettings) {
+@@ -1081,7 +1081,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+             this.server.server.getPluginManager().callEvent(event);
+         }
+         // CraftBukkit end
++
 +        // Paper start - add PlayerLocaleChangeEvent
 +        // Since the field is initialized to null, this event should always fire the first time the packet is received
 +        String oldLocale = this.locale;
@@ -49,5 +50,5 @@ index 7568fc8..d23cade 100644
  
          @Override
 -- 
-2.7.4 (Apple Git-66)
+2.8.2.windows.1
 
diff --git a/work/Bukkit b/work/Bukkit
-Subproject b276e93f56cc04aaa2011efa1fe16b839c611eb
+Subproject 7c7228c87abb4e787dd466e47e3c30a7757945e
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject 042911fef46a2efd1fcc4266a01ede48e6e2948
+Subproject 106ced01e0bd24a20633d4f3aa99c2452736be7