Update upstream

2018-03-25 20:06:44 -04:00 · 2018-03-25 20:06:44 -04:00 · 9b12f54b69
Commit 9b12f54b69
--- a/Spigot-Server-Patches/0006-Timings-v2.patch
+++ b/Spigot-Server-Patches/0006-Timings-v2.patch
@ -1,4 +1,4 @@
-From 4505cd99ae7f9f55a1129e1a4ef8924aa27713b1 Mon Sep 17 00:00:00 2001
+From e401c3871d43c9580bbff0f5846e19229df0d656 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@ -635,7 +635,7 @@ index ed39b122e..e09ced1a2 100644
 
     public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ecff5fce3..756590ac0 100644
+index 0026f29d5..d15cfdd76 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -31,7 +31,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -647,7 +647,7 @@ index ecff5fce3..756590ac0 100644
 
 public abstract class EntityLiving extends Entity {
 
-@@ -1867,7 +1867,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1869,7 +1869,6 @@ public abstract class EntityLiving extends Entity {
     }
 
     public void B_() {
@ -655,7 +655,7 @@ index ecff5fce3..756590ac0 100644
         super.B_();
         this.cI();
         if (!this.world.isClientSide) {
-@@ -1940,9 +1939,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1942,9 +1941,7 @@ public abstract class EntityLiving extends Entity {
             }
         }
 
@ -665,7 +665,7 @@ index ecff5fce3..756590ac0 100644
         double d0 = this.locX - this.lastX;
         double d1 = this.locZ - this.lastZ;
         float f = (float) (d0 * d0 + d1 * d1);
-@@ -2018,8 +2015,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2020,8 +2017,6 @@ public abstract class EntityLiving extends Entity {
         } else {
             this.bq = 0;
         }
@ -674,7 +674,7 @@ index ecff5fce3..756590ac0 100644
     }
 
     protected float g(float f, float f1) {
-@@ -2084,7 +2079,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2086,7 +2081,6 @@ public abstract class EntityLiving extends Entity {
         }
 
         this.world.methodProfiler.a("ai");
@ -682,7 +682,7 @@ index ecff5fce3..756590ac0 100644
         if (this.isFrozen()) {
             this.bd = false;
             this.be = 0.0F;
-@@ -2095,7 +2089,6 @@ public abstract class EntityLiving extends Entity {
+@@ -2097,7 +2091,6 @@ public abstract class EntityLiving extends Entity {
             this.doTick();
             this.world.methodProfiler.b();
         }
@ -690,7 +690,7 @@ index ecff5fce3..756590ac0 100644
 
         this.world.methodProfiler.b();
         this.world.methodProfiler.a("jump");
-@@ -2118,14 +2111,10 @@ public abstract class EntityLiving extends Entity {
+@@ -2120,14 +2113,10 @@ public abstract class EntityLiving extends Entity {
         this.bg *= 0.98F;
         this.bh *= 0.9F;
         this.r();
@ -1062,7 +1062,7 @@ index f74b06794..1fc632e0c 100644
 +    // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 0a0b8a426..e098a7a1f 100644
+index 6d27860cd..0fc37a095 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1,5 +1,6 @@
--- a/Spigot-Server-Patches/0077-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0077-Custom-replacement-for-eaten-items.patch
@ -1,14 +1,14 @@
-From 43a8e8c9b03128433633aa173352ee4529a83541 Mon Sep 17 00:00:00 2001
+From c0852484004f5469a55cf7b701da774014ff4b72 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 5a6b3398..4c632bb6 100644
+index 2aaeac324..7e2cc66d7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2375,12 +2375,13 @@ public abstract class EntityLiving extends Entity {
+@@ -2377,12 +2377,13 @@ public abstract class EntityLiving extends Entity {
 
     protected void v() {
         if (!this.activeItem.isEmpty() && this.isHandRaised()) {
@ -23,7 +23,7 @@ index 5a6b3398..4c632bb6 100644
                 world.getServer().getPluginManager().callEvent(event);
 
                 if (event.isCancelled()) {
-@@ -2395,9 +2396,21 @@ public abstract class EntityLiving extends Entity {
+@@ -2397,9 +2398,21 @@ public abstract class EntityLiving extends Entity {
                 itemstack = this.activeItem.a(this.world, this);
             }
 
@ -46,5 +46,5 @@ index 5a6b3398..4c632bb6 100644
 
     }
 -- 
-2.14.3
+2.16.2

--- a/Spigot-Server-Patches/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0078-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@ -1,11 +1,11 @@
-From 7b345395ba95323d922c1f191b27272d7ed0fef7 Mon Sep 17 00:00:00 2001
+From 73ac346074556ad06db864c7e3667a6b7f6fbb4f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data


 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 9f1fb04b7..36a1348bd 100644
+index 7e2cc66d7..a92b89d7c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -488,7 +488,13 @@ public abstract class EntityLiving extends Entity {
@ -34,7 +34,7 @@ index 9f1fb04b7..36a1348bd 100644
         // CraftBukkit start - Handle scaled health
         if (this instanceof EntityPlayer) {
             org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
-@@ -2263,7 +2273,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2265,7 +2275,7 @@ public abstract class EntityLiving extends Entity {
     }
 
     public void setAbsorptionHearts(float f) {
@ -56,5 +56,5 @@ index 45b11d87c..aa7751059 100644
     }
 
 -- 
-2.16.1
+2.16.2

--- a/Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch
+++ b/Spigot-Server-Patches/0141-Toggleable-Elytra-Wall-Damage.patch
@ -1,4 +1,4 @@
-From 8533cbf80b03340e72c47c47f97f7d26f916adf7 Mon Sep 17 00:00:00 2001
+From 4d3b8719bc006e01e01ac058f2fe9215d8d196ee Mon Sep 17 00:00:00 2001
 From: Jadon Fowler <jadonflower@gmail.com>
 Date: Sat, 18 Jun 2016 23:13:59 -0700
 Subject: [PATCH] Toggleable Elytra Wall Damage
@ -21,10 +21,10 @@ index 112c447e2..d182e716a 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index edc9d94b7..f76be4da0 100644
+index 4b6bb38ae..dda6219a7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1737,6 +1737,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1739,6 +1739,7 @@ public abstract class EntityLiving extends Entity {
                     this.motY = 0.30000001192092896D;
                 }
             } else if (this.cP()) {
@ -32,7 +32,7 @@ index edc9d94b7..f76be4da0 100644
                 if (this.motY > -0.5D) {
                     this.fallDistance = 1.0F;
                 }
-@@ -1786,6 +1787,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1788,6 +1789,7 @@ public abstract class EntityLiving extends Entity {
                         this.damageEntity(DamageSource.FLY_INTO_WALL, f8);
                     }
                 }
@ -41,5 +41,5 @@ index edc9d94b7..f76be4da0 100644
                 if (this.onGround && !this.world.isClientSide) {
                     if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
 -- 
-2.16.1
+2.16.2

--- a/Spigot-Server-Patches/0197-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0197-Cap-Entity-Collisions.patch
@ -1,4 +1,4 @@
-From 9d475c9558f74b1a36807eb10a61656dca34897c Mon Sep 17 00:00:00 2001
+From 27376f342b71acfc59a880589e60757726ac340d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@ -27,7 +27,7 @@ index 7871406e4..3ba465305 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a6ffe144f..f08f4ae56 100644
+index 546059414..a5ed651dd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -170,6 +170,7 @@ public abstract class Entity implements ICommandListener {
@ -39,10 +39,10 @@ index a6ffe144f..f08f4ae56 100644
     // Spigot end
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index ab3ab3889..6829f8f9c 100644
+index 91e8c1d75..adb045937 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2189,8 +2189,11 @@ public abstract class EntityLiving extends Entity {
+@@ -2191,8 +2191,11 @@ public abstract class EntityLiving extends Entity {
                 }
             }
 
@ -56,5 +56,5 @@ index ab3ab3889..6829f8f9c 100644
                 this.C(entity);
             }
 -- 
-2.16.1
+2.16.2

--- a/Spigot-Server-Patches/0246-Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/0246-Add-PlayerArmorChangeEvent.patch
@ -1,11 +1,11 @@
-From d550c213879bcea6cf496830f8218b276fb64dba Mon Sep 17 00:00:00 2001
+From 3808c1301f671596ed68c498a2cfd835c55b337d Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent


 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4e7cf5de6..b65b88586 100644
+index aa4c23a16..d1b3b20fb 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1,5 +1,6 @@
@ -15,7 +15,7 @@ index 4e7cf5de6..b65b88586 100644
 import com.google.common.base.Objects;
 import com.google.common.collect.Maps;
 import java.util.Collection;
-@@ -1930,6 +1931,13 @@ public abstract class EntityLiving extends Entity {
+@@ -1932,6 +1933,13 @@ public abstract class EntityLiving extends Entity {
                 ItemStack itemstack1 = this.getEquipment(enumitemslot);
 
                 if (!ItemStack.matches(itemstack1, itemstack)) {
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit 29705a0d4f65440b4d91cba67d63bbac884a833e
+Subproject commit aa255689c1e00b77b066440bbfd2d84b641bfd58