From 42772e476a5a3c7296b76ace6626048cda668e21 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 17 Oct 2018 23:06:33 -0400 Subject: [PATCH] [CI-SKIP] [Auto] Rebuild Patches A recent commit has been made that caused patches to be out of order, rebuilding --- ... 0394-Limit-lightning-strike-effect-distance.patch} | 10 +++++----- ...t-getters-and-setters-for-EntityItem-owner-a.patch} | 8 ++++---- ...-Check-other-worlds-for-shooter-of-projectil.patch} | 2 +- ...re-chunk-neighbor-counts-do-not-get-desynced.patch} | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) rename Spigot-Server-Patches/{0393-Limit-lightning-strike-effect-distance.patch => 0394-Limit-lightning-strike-effect-distance.patch} (96%) rename Spigot-Server-Patches/{0394-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0395-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (95%) rename Spigot-Server-Patches/{0395-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0396-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (96%) rename Spigot-Server-Patches/{0396-Ensure-chunk-neighbor-counts-do-not-get-desynced.patch => 0397-Ensure-chunk-neighbor-counts-do-not-get-desynced.patch} (97%) diff --git a/Spigot-Server-Patches/0393-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0394-Limit-lightning-strike-effect-distance.patch similarity index 96% rename from Spigot-Server-Patches/0393-Limit-lightning-strike-effect-distance.patch rename to Spigot-Server-Patches/0394-Limit-lightning-strike-effect-distance.patch index 8d6f9fda29..79f1ad1965 100644 --- a/Spigot-Server-Patches/0393-Limit-lightning-strike-effect-distance.patch +++ b/Spigot-Server-Patches/0394-Limit-lightning-strike-effect-distance.patch @@ -1,11 +1,11 @@ -From d723ec8024fb555d6ba49215319aafbf74c3a0ff Mon Sep 17 00:00:00 2001 +From 4019f5499718146069b86ac3265e88c1a7e2c9a1 Mon Sep 17 00:00:00 2001 From: Trigary Date: Fri, 14 Sep 2018 17:42:08 +0200 Subject: [PATCH] Limit lightning strike effect distance diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 93bf8c6d3..25246eac5 100644 +index 93bf8c6d3c..25246eac58 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -237,6 +237,30 @@ public class PaperWorldConfig { @@ -40,7 +40,7 @@ index 93bf8c6d3..25246eac5 100644 public boolean firePhysicsEventForRedstone = false; private void firePhysicsEventForRedstone() { diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java -index afbe43dd3..f64e6e864 100644 +index afbe43dd34..f64e6e864d 100644 --- a/src/main/java/net/minecraft/server/EntityLightning.java +++ b/src/main/java/net/minecraft/server/EntityLightning.java @@ -60,6 +60,14 @@ public class EntityLightning extends EntityWeather { @@ -68,7 +68,7 @@ index afbe43dd3..f64e6e864 100644 --this.lifeTicks; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 0a7648263..b41dc3a73 100644 +index 0a76482638..b41dc3a732 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1087,7 +1087,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -81,5 +81,5 @@ index 0a7648263..b41dc3a73 100644 } else { return false; -- -2.19.0 +2.19.1 diff --git a/Spigot-Server-Patches/0394-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0395-Implement-getters-and-setters-for-EntityItem-owner-a.patch similarity index 95% rename from Spigot-Server-Patches/0394-Implement-getters-and-setters-for-EntityItem-owner-a.patch rename to Spigot-Server-Patches/0395-Implement-getters-and-setters-for-EntityItem-owner-a.patch index ec0eafb11d..db2948de94 100644 --- a/Spigot-Server-Patches/0394-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-Server-Patches/0395-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From ee7193b21f5f53806d0e97db356d47f46d9b9d55 Mon Sep 17 00:00:00 2001 +From beb6f53cb74202be5ba6f91d544f59bf5552e514 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:23 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and @@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index f596b4351..67b29c55f 100644 +index f596b4351b..67b29c55f6 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -410,20 +410,22 @@ public class EntityItem extends Entity { @@ -37,7 +37,7 @@ index f596b4351..67b29c55f 100644 this.f = uuid; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index 1df17f09b..3da71da5c 100644 +index 1df17f09bb..3da71da5c2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -9,6 +9,11 @@ import org.bukkit.inventory.ItemStack; @@ -92,5 +92,5 @@ index 1df17f09b..3da71da5c 100644 @Override -- -2.19.0 +2.19.1 diff --git a/Spigot-Server-Patches/0395-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0396-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 96% rename from Spigot-Server-Patches/0395-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to Spigot-Server-Patches/0396-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch index 659ef06282..4dffc7e3ec 100644 --- a/Spigot-Server-Patches/0395-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch +++ b/Spigot-Server-Patches/0396-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch @@ -1,4 +1,4 @@ -From d6423d5e60baa126e36ae5a5dddca163a36992d6 Mon Sep 17 00:00:00 2001 +From 10ed67d0aaea1d1c33432e54ccbc5fe324b2a33b Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 17 Oct 2018 19:17:27 -0400 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles diff --git a/Spigot-Server-Patches/0396-Ensure-chunk-neighbor-counts-do-not-get-desynced.patch b/Spigot-Server-Patches/0397-Ensure-chunk-neighbor-counts-do-not-get-desynced.patch similarity index 97% rename from Spigot-Server-Patches/0396-Ensure-chunk-neighbor-counts-do-not-get-desynced.patch rename to Spigot-Server-Patches/0397-Ensure-chunk-neighbor-counts-do-not-get-desynced.patch index 7b37a28bb1..15f1c67fd6 100644 --- a/Spigot-Server-Patches/0396-Ensure-chunk-neighbor-counts-do-not-get-desynced.patch +++ b/Spigot-Server-Patches/0397-Ensure-chunk-neighbor-counts-do-not-get-desynced.patch @@ -1,4 +1,4 @@ -From 5d6a6cd178b5baef11c1a52c7f91bf71ef789da4 Mon Sep 17 00:00:00 2001 +From 7e6256031e8db371c47b33f612150c7c0f9aee17 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 17 Oct 2018 22:31:54 -0400 Subject: [PATCH] Ensure chunk neighbor counts do not get desynced