Update upstream B/CB

2024-11-25 20:16:19 +01:00 · 2017-01-14 02:11:12 -06:00 · 2017-01-14 02:11:12 -06:00 · 28c0441d02
commit 28c0441d02
parent aa86f4829a
13 changed files with 64 additions and 47 deletions
--- a/Spigot-Server-Patches/0029-Configurable-end-credits.patch
+++ b/Spigot-Server-Patches/0029-Configurable-end-credits.patch
@ -1,4 +1,4 @@
-From ebb94ef7bf1505f81ec9c72e84b1b56ceb7970d6 Mon Sep 17 00:00:00 2001
+From 3b508958a6df58a75ec54bc7bbea5e5cf1cd89bf Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
@ -20,10 +20,10 @@ index f7a0c18..31503e7 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 12e4d95..dc02472 100644
+index 64ba161..a11d882 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -512,6 +512,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -513,6 +513,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
         return this.world.pvpMode;
     }
 
@ -39,7 +39,7 @@ index 12e4d95..dc02472 100644
     @Nullable
     public Entity c(int i) {
         // this.worldChangeInvuln = true; // CraftBukkit - Moved down and into PlayerList#changeDimension
-@@ -520,7 +529,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -521,7 +530,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
             this.world.kill(this);
             if (!this.viewingCredits) {
                 this.viewingCredits = true;
--- a/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch
+++ b/Spigot-Server-Patches/0036-Add-player-view-distance-API.patch
@ -1,14 +1,14 @@
-From 886c56449b243cfcf0e0f38a476926453e4dd522 Mon Sep 17 00:00:00 2001
+From 09f331d1c102fe49bec0005f28574e4a22b5d068 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 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 dc02472..80e7105 100644
+index a11d882..5717de3 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -56,6 +56,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -57,6 +57,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
     public boolean f;
     public int ping;
     public boolean viewingCredits;
--- a/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch
+++ b/Spigot-Server-Patches/0043-Configurable-container-update-tick-rate.patch
@ -1,4 +1,4 @@
-From 05da6da19a804f28d5a78f078ce02f86366013f9 Mon Sep 17 00:00:00 2001
+From a2853b3936feb4cfc3ad6fa21e0b7a4dbb24ee51 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
@ -19,10 +19,10 @@ index 57480f5..b2b94b8 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 80e7105..2c8a21e 100644
+index 5717de3..e3a3ed4 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -65,6 +65,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -66,6 +66,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
         this.viewDistance = viewDistance;
     }
     // Paper end
@ -30,7 +30,7 @@ index 80e7105..2c8a21e 100644
 
     // CraftBukkit start
     public String displayName;
-@@ -227,7 +228,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -228,7 +229,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
             --this.noDamageTicks;
         }
 
--- a/Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0079-Custom-replacement-for-eaten-items.patch
@ -1,24 +1,41 @@
-From 863ebbfe00939702cab6e4f7c0b1c99a3987f54a Mon Sep 17 00:00:00 2001
+From 0cff8c26c45dac3c873b16c4b6aea730439d8c7a Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items


 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index bf8fbac4e..21603953c 100644
+index 193dadf..ee177b2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2341,7 +2341,20 @@ public abstract class EntityLiving extends Entity {
-             ItemStack itemstack = (craftItem.equals(event.getItem())) ? this.activeItem.a(this.world, this) : CraftItemStack.asNMSCopy(event.getItem()).a(world, this);
-             this.a(this.cz(), itemstack);
-             // CraftBukkit end
-+
+@@ -2323,12 +2323,13 @@ public abstract class EntityLiving extends Entity {
+ 
+     protected void v() {
+         if (!this.activeItem.isEmpty() && this.isHandRaised()) {
+            PlayerItemConsumeEvent event = null; // Paper
+             this.a(this.activeItem, 16);
+             // CraftBukkit start - fire PlayerItemConsumeEvent
+             ItemStack itemstack;
+             if (this instanceof EntityPlayer) {
+                 org.bukkit.inventory.ItemStack craftItem = CraftItemStack.asBukkitCopy(this.activeItem);
+-                PlayerItemConsumeEvent event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem);
+                event = new PlayerItemConsumeEvent((Player) this.getBukkitEntity(), craftItem); // Paper
+                 world.getServer().getPluginManager().callEvent(event);
+ 
+                 if (event.isCancelled()) {
+@@ -2343,9 +2344,22 @@ public abstract class EntityLiving extends Entity {
+                 itemstack = this.activeItem.a(this.world, this);
+             }
+ 
 +            // Paper start - save the default replacement item and change it if necessary
 +            final ItemStack defaultReplacement = itemstack;
-+            if (event.getReplacement() != null) {
+            if (event != null && event.getReplacement() != null) {
 +                itemstack = CraftItemStack.asNMSCopy(event.getReplacement());
 +            }
 +            // Paper end
+
+             this.a(this.cz(), itemstack);
+             // CraftBukkit end
 +
             this.cF();
 +
@ -30,5 +47,5 @@ index bf8fbac4e..21603953c 100644
 
     }
 -- 
-2.11.0
+2.9.3

--- a/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0120-Implement-PlayerLocaleChangeEvent.patch
@ -1,14 +1,14 @@
-From 4cf4080ae649b04c6c320bc8dbcb95abcd93bfc5 Mon Sep 17 00:00:00 2001
+From 681b5bbd1941e58fa30fb659b4be06197672428b Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 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 2c8a21e..182c0bb 100644
+index e3a3ed4..548fa97 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -28,7 +28,7 @@ import org.bukkit.inventory.MainHand;
+@@ -29,7 +29,7 @@ import org.bukkit.inventory.MainHand;
 public class EntityPlayer extends EntityHuman implements ICrafting {
 
     private static final Logger bR = LogManager.getLogger();
@ -17,7 +17,7 @@ index 2c8a21e..182c0bb 100644
     public PlayerConnection playerConnection;
     public final MinecraftServer server;
     public final PlayerInteractManager playerInteractManager;
-@@ -1088,7 +1088,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1092,7 +1092,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
             this.server.server.getPluginManager().callEvent(event);
         }
         // CraftBukkit end
--- 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 b80ea9a6af52ea19e97e53aa766308d73b11c400 Mon Sep 17 00:00:00 2001
+From 8999e61b98f3d5d75ab3b7c7425b4d5674cd9803 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 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 182c0bb..de2d439 100644
+index 548fa97..a52b562 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -649,6 +649,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -650,6 +650,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);
         }
--- a/Spigot-Server-Patches/0160-Auto-Save-Improvements.patch
+++ b/Spigot-Server-Patches/0160-Auto-Save-Improvements.patch
@ -1,4 +1,4 @@
-From 50a06f81e5749b70315ab59c6e1995f3d64284d5 Mon Sep 17 00:00:00 2001
+From 296081bf03b9bc981daf2e992caca68314ad4a17 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@ -96,10 +96,10 @@ index 7a56a64..5c5a56c 100644
                 }
             }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index de2d439..4ad336e 100644
+index a52b562..ff85e16 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -29,6 +29,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -30,6 +30,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
 
     private static final Logger bR = LogManager.getLogger();
     public String locale = null; // Spigot private -> public // Paper - default to null
--- a/Spigot-Server-Patches/0163-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0163-Auto-fix-bad-Y-levels-on-player-login.patch
@ -1,4 +1,4 @@
-From c9afe3d9ff87d23d46af6f8c7d7f6180bbeafc6d Mon Sep 17 00:00:00 2001
+From e2e97246b82c9879582fcee0c284e3c7297e9f5a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@ -6,10 +6,10 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash

 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4ad336e..ab2b4c4 100644
+index ff85e16..865ab5a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -127,6 +127,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -128,6 +128,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
             }
         }
 
--- a/Spigot-Server-Patches/0175-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0175-Optimise-removeQueue.patch
@ -1,11 +1,11 @@
-From ad0bf093ecf355f058b4a8b1b2e2f2d592b69313 Mon Sep 17 00:00:00 2001
+From 2e1f99744ba6f577e406758d9d09dc0f7151f6e9 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 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 ab2b4c4..fa09ef1 100644
+index 865ab5a..6325baf 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;
@ -18,7 +18,7 @@ index ab2b4c4..fa09ef1 100644
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-@@ -35,7 +37,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -36,7 +38,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
     public final PlayerInteractManager playerInteractManager;
     public double d;
     public double e;
@ -27,7 +27,7 @@ index ab2b4c4..fa09ef1 100644
     private final ServerStatisticManager bU;
     private float bV = Float.MIN_VALUE;
     private int bW = Integer.MIN_VALUE;
-@@ -247,10 +249,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -248,10 +250,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
             Iterator iterator = this.removeQueue.iterator();
             int j = 0;
 
@ -46,7 +46,7 @@ index ab2b4c4..fa09ef1 100644
 
             this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
         }
-@@ -987,7 +996,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -991,7 +1000,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
         this.lastSentExp = -1;
         this.lastHealthSent = -1.0F;
         this.cc = -1;
--- a/Spigot-Server-Patches/0192-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0192-Properly-fix-item-duplication-bug.patch
@ -1,4 +1,4 @@
-From a51e21a4d00fef8b1e2265d231c1c5b017113720 Mon Sep 17 00:00:00 2001
+From c21aa545333086606e28bdfdff1e9615ed8cbd05 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 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 fa09ef1..c703904 100644
+index 6325baf..e8659a5 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1329,7 +1329,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1333,7 +1333,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
 
     @Override
     protected boolean isFrozen() {
@ -19,7 +19,7 @@ index fa09ef1..c703904 100644
 
     public void reset() {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5f1fdb1..040c07b 100644
+index c6d6301..48fc18f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2542,6 +2542,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
--- a/Spigot-Server-Patches/0196-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
+++ b/Spigot-Server-Patches/0196-Change-Outdated-Build-Download-URL-to-Paper-CI.patch
@ -1,15 +1,15 @@
-From a420570260a7e6f8b47016ed1224501625e58c4d Mon Sep 17 00:00:00 2001
+From e720145d8e5a1c3c0106b829a5c4c5da1c7a5152 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 29 Dec 2016 00:56:51 -0500
 Subject: [PATCH] Change Outdated Build Download URL to Paper CI


 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5992196..ca186b2 100644
+index 4ac4e6f..3164e71 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -200,7 +200,7 @@ public class Main {
-                     deadline.add(Calendar.DAY_OF_YEAR, -7);
+                     deadline.add(Calendar.DAY_OF_YEAR, -10);
                     if (buildDate.before(deadline.getTime())) {
                         System.err.println("*** Error, this build is outdated ***");
 -                        System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/ ***");
--- a/work/Bukkit
+++ b/work/Bukkit
@ -1 +1 @@
-Subproject commit 59b32ee3f35b2b8d55337df9a86f2b480e23c39d
+Subproject commit 39c5d6b4a11b3e7c2eeb12a8bae5495f95ccc247
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit d5e7885c2e3c6a9bf6ba2af51896800d748877ad
+Subproject commit 775f1e1f7f5783860ccb16feaf8c0cc53a6f9c18