From 6760f394ef260b70edeb2e2707f9f29c65dfb5cd Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 19 Mar 2016 20:20:25 -0500 Subject: [PATCH] Update upstream and rebuild patches --- Bukkit | 2 +- CraftBukkit | 2 +- .../0011-Player-Exhaustion-Multipliers.patch | 6 +- ...0094-Pass-world-to-Village-creation.patch} | 2 +- ...anges-to-blocking-code-fix-issue-whe.patch | 73 ------------------- ...-Custom-replacement-for-eaten-items.patch} | 6 +- ... 0096-Set-health-before-death-event.patch} | 2 +- 7 files changed, 10 insertions(+), 83 deletions(-) rename Spigot-Server-Patches/{0095-Pass-world-to-Village-creation.patch => 0094-Pass-world-to-Village-creation.patch} (95%) delete mode 100644 Spigot-Server-Patches/0094-Revert-Spigot-changes-to-blocking-code-fix-issue-whe.patch rename Spigot-Server-Patches/{0096-Custom-replacement-for-eaten-items.patch => 0095-Custom-replacement-for-eaten-items.patch} (90%) rename Spigot-Server-Patches/{0097-Set-health-before-death-event.patch => 0096-Set-health-before-death-event.patch} (96%) diff --git a/Bukkit b/Bukkit index 485fc0c470..0b10b8e543 160000 --- a/Bukkit +++ b/Bukkit @@ -1 +1 @@ -Subproject commit 485fc0c47004dcad63c4b425a25dfd9850bc3cb6 +Subproject commit 0b10b8e543444426153f48d4ec348ac15f4cf1f3 diff --git a/CraftBukkit b/CraftBukkit index 4cd46b242b..b3f6de0da5 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 4cd46b242beecb828dbe193c9cb913b620e852d1 +Subproject commit b3f6de0da51ba476bb6792f6fdf44cec472d3cce diff --git a/Spigot-Server-Patches/0011-Player-Exhaustion-Multipliers.patch b/Spigot-Server-Patches/0011-Player-Exhaustion-Multipliers.patch index fc8be88b07..11fbf8ff2d 100644 --- a/Spigot-Server-Patches/0011-Player-Exhaustion-Multipliers.patch +++ b/Spigot-Server-Patches/0011-Player-Exhaustion-Multipliers.patch @@ -1,4 +1,4 @@ -From 714b27a7819a114922fedd7a31a2bb58644643f3 Mon Sep 17 00:00:00 2001 +From fc81aefe033c0c5a07b37e7306111b1a01218137 Mon Sep 17 00:00:00 2001 From: gsand Date: Tue, 1 Mar 2016 13:43:16 -0600 Subject: [PATCH] Player Exhaustion Multipliers @@ -36,10 +36,10 @@ index 1d2f580..bed5577 100644 ItemStack itemstack1 = this.u(iblockdata); diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index ba32125..17fbc17 100644 +index 697f145..83f84ea 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1449,13 +1449,13 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1448,13 +1448,13 @@ public abstract class EntityHuman extends EntityLiving { i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F); if (i > 0) { this.a(StatisticList.q, i); diff --git a/Spigot-Server-Patches/0095-Pass-world-to-Village-creation.patch b/Spigot-Server-Patches/0094-Pass-world-to-Village-creation.patch similarity index 95% rename from Spigot-Server-Patches/0095-Pass-world-to-Village-creation.patch rename to Spigot-Server-Patches/0094-Pass-world-to-Village-creation.patch index 6d5dad1eb8..4a9a7cfc79 100644 --- a/Spigot-Server-Patches/0095-Pass-world-to-Village-creation.patch +++ b/Spigot-Server-Patches/0094-Pass-world-to-Village-creation.patch @@ -1,4 +1,4 @@ -From 7c2acad690c96df7fbb0aed0428251d272d81c02 Mon Sep 17 00:00:00 2001 +From 2c7a29fbfa9acfcf9dcd896415ed953a0649b0c3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 19 Mar 2016 15:16:54 -0400 Subject: [PATCH] Pass world to Village creation diff --git a/Spigot-Server-Patches/0094-Revert-Spigot-changes-to-blocking-code-fix-issue-whe.patch b/Spigot-Server-Patches/0094-Revert-Spigot-changes-to-blocking-code-fix-issue-whe.patch deleted file mode 100644 index 948fb7e282..0000000000 --- a/Spigot-Server-Patches/0094-Revert-Spigot-changes-to-blocking-code-fix-issue-whe.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 352b49921f8668d23b12b13a0cccd1a929ad9d86 Mon Sep 17 00:00:00 2001 -From: DemonWav -Date: Sat, 19 Mar 2016 12:14:50 -0500 -Subject: [PATCH] Revert Spigot changes to blocking code, fix issue where - entities cannot die - - -diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 34abdd4..a78614c 100644 ---- a/src/main/java/net/minecraft/server/EntityLiving.java -+++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1,30 +1,28 @@ - package net.minecraft.server; - --import com.google.common.base.Objects; --import com.google.common.collect.Maps; --import java.util.Collection; --import java.util.Iterator; --import java.util.List; --import java.util.Map; --import java.util.Random; --import java.util.UUID; -- --// CraftBukkit start --import java.util.ArrayList; - import com.google.common.base.Function; -+import com.google.common.base.Objects; - import com.google.common.collect.Lists; -+import com.google.common.collect.Maps; - import org.bukkit.craftbukkit.attribute.CraftAttributeMap; - import org.bukkit.craftbukkit.event.CraftEventFactory; - import org.bukkit.craftbukkit.inventory.CraftItemStack; --import org.bukkit.entity.LivingEntity; - import org.bukkit.entity.Player; - import org.bukkit.event.entity.EntityDamageEvent; - import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; - import org.bukkit.event.entity.EntityRegainHealthEvent; - import org.bukkit.event.player.PlayerItemConsumeEvent; --// CraftBukkit end - --import co.aikar.timings.SpigotTimings; // Paper -+import java.util.ArrayList; -+import java.util.Collection; -+import java.util.Iterator; -+import java.util.List; -+import java.util.Map; -+import java.util.Random; -+import java.util.UUID; -+ -+// CraftBukkit start -+// CraftBukkit end - - public abstract class EntityLiving extends Entity { - -@@ -1157,7 +1155,14 @@ public abstract class EntityLiving extends Entity { - Function blocking = new Function() { - @Override - public Double apply(Double f) { -- return (damagesource.a()) ? -0.0 : f * 0.33F; // PAIL: rename -+ // Paper start - revert Spigot change -+ if (human) { -+ if (!damagesource.ignoresArmor() && ((EntityHuman) EntityLiving.this).isBlocking() && f > 0.0F) { -+ return -(f - ((1.0F + f) * 0.5F)); -+ } -+ } -+ return -0.0; -+ // Paper end - } - }; - float blockingModifier = blocking.apply((double) f).floatValue(); --- -2.7.3 - diff --git a/Spigot-Server-Patches/0096-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch similarity index 90% rename from Spigot-Server-Patches/0096-Custom-replacement-for-eaten-items.patch rename to Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch index 9af7e0fe24..5eb6ca6657 100644 --- a/Spigot-Server-Patches/0096-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0095-Custom-replacement-for-eaten-items.patch @@ -1,14 +1,14 @@ -From de05a5dbaa3091c15b701ddae3482249ad0fc4c2 Mon Sep 17 00:00:00 2001 +From 802d84654bf55a30dbb2e182f46f8b206ca8d731 Mon Sep 17 00:00:00 2001 From: Jedediah Smith 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 a78614c..c6f96a1 100644 +index 5cb2f8e..3c4501b 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -2219,12 +2219,25 @@ public abstract class EntityLiving extends Entity { +@@ -2214,12 +2214,25 @@ public abstract class EntityLiving extends Entity { ItemStack itemstack = (craftItem.equals(event.getItem())) ? this.bm.a(this.world, this) : CraftItemStack.asNMSCopy(event.getItem()).a(world, this); // CraftBukkit end diff --git a/Spigot-Server-Patches/0097-Set-health-before-death-event.patch b/Spigot-Server-Patches/0096-Set-health-before-death-event.patch similarity index 96% rename from Spigot-Server-Patches/0097-Set-health-before-death-event.patch rename to Spigot-Server-Patches/0096-Set-health-before-death-event.patch index 70d6081aa6..b121f368ab 100644 --- a/Spigot-Server-Patches/0097-Set-health-before-death-event.patch +++ b/Spigot-Server-Patches/0096-Set-health-before-death-event.patch @@ -1,4 +1,4 @@ -From eef7f73163efe6762aeed5ad0f994f63050bf159 Mon Sep 17 00:00:00 2001 +From 7d325496113f18deda2c942e4f3e92013235a0b9 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 19 Jul 2015 16:51:38 -0400 Subject: [PATCH] Set health before death event