From 2828dd1c67bb8d5f9b4e0fcff2a05c7950e5acad Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 7 Mar 2019 17:16:39 +0000 Subject: [PATCH] Revert "Don't update snapshot blockstates" (Fixes #1882) CraftBukkit already checks that we're not trying to copy data back to the same snapshot, reverting this fixes the ability to properly update non-snapshot blockstates --- ...73-Don-t-update-snapshot-blockstates.patch | 26 ------ ...> 0373-Hook-into-CB-plugin-rewrites.patch} | 4 +- ...74-Allow-setting-the-vex-s-summoner.patch} | 6 +- ...75-Add-LivingEntity-getTargetEntity.patch} | 6 +- ...I.patch => 0376-Add-sun-related-API.patch} | 6 +- ...wned-for-Villager-Aggression-Config.patch} | 4 +- ...-Johnny.patch => 0378-Here-s-Johnny.patch} | 4 +- ...Turtle-API.patch => 0379-Turtle-API.patch} | 4 +- ...it-lightning-strike-effect-distance.patch} | 10 +-- ...-and-setters-for-EntityItem-owner-a.patch} | 4 +- ...her-worlds-for-shooter-of-projectil.patch} | 4 +- ...Call-player-spectator-target-events.patch} | 4 +- ...-Add-Velocity-IP-Forwarding-Support.patch} | 4 +- ...PI.patch => 0385-Add-more-Witch-API.patch} | 4 +- ...MC-93764.patch => 0386-Fix-MC-93764.patch} | 4 +- ...vent-players-from-moving-into-unloa.patch} | 8 +- ...8-Reset-players-airTicks-on-respawn.patch} | 4 +- ...-area-unicode-characters-from-signs.patch} | 4 +- ...after-profile-lookups-if-not-needed.patch} | 4 +- ...le-thread-count-default-for-bootstr.patch} | 4 +- ...Use-EntityTypes-for-living-entities.patch} | 84 +++++++++---------- ...id-item-for-enchantment-checks-on-b.patch} | 4 +- ...=> 0394-Optimize-World-Time-Updates.patch} | 6 +- ...tore-custom-InventoryHolder-support.patch} | 4 +- ...=> 0396-Use-Vanilla-Minecart-Speeds.patch} | 6 +- ...0397-Fix-SpongeAbsortEvent-handling.patch} | 4 +- ...-allow-digging-into-unloaded-chunks.patch} | 4 +- ...=> 0399-Optimize-redstone-algorithm.patch} | 12 +-- ...ntity-dismount-during-teleportation.patch} | 6 +- ...mits.patch => 0401-Book-Size-Limits.patch} | 4 +- ...ult-permission-message-configurable.patch} | 4 +- ...I.patch => 0403-Add-more-Zombie-API.patch} | 4 +- ...t-which-we-ll-consider-an-attackabl.patch} | 6 +- ...revent-rayTrace-from-loading-chunks.patch} | 6 +- ...-Large-Packets-disconnecting-client.patch} | 4 +- ...world-storage-in-CraftOfflinePlayer.patch} | 4 +- ...0408-Add-PlayerConnectionCloseEvent.patch} | 4 +- ...revent-Enderman-from-loading-chunks.patch} | 4 +- ...replace-OfflinePlayer-getLastPlayed.patch} | 4 +- ...tch => 0411-Fix-PlayerEditBookEvent.patch} | 4 +- ...ehicle-tracking-issue-on-disconnect.patch} | 6 +- ...nRetractEvent-for-all-empty-pistons.patch} | 4 +- ...remove-from-being-called-on-Players.patch} | 4 +- ...15-Allow-Saving-of-Oversized-Chunks.patch} | 4 +- ...ent.patch => 0416-BlockDestroyEvent.patch} | 6 +- ...m-Shapeless-Custom-Crafting-Recipes.patch} | 6 +- ...h => 0418-Fix-sign-edit-memory-leak.patch} | 8 +- ... 0419-Limit-Client-Sign-length-more.patch} | 6 +- ...onvertSigns-boolean-every-sign-save.patch} | 6 +- ...Signs-in-Chunks-creating-too-large-.patch} | 10 +-- ...-Fix-Whitelist-On-Off-inconsistency.patch} | 8 +- ...t-tick-at-start-of-drowning-process.patch} | 2 +- 52 files changed, 170 insertions(+), 196 deletions(-) delete mode 100644 Spigot-Server-Patches/0373-Don-t-update-snapshot-blockstates.patch rename Spigot-Server-Patches/{0374-Hook-into-CB-plugin-rewrites.patch => 0373-Hook-into-CB-plugin-rewrites.patch} (99%) rename Spigot-Server-Patches/{0375-Allow-setting-the-vex-s-summoner.patch => 0374-Allow-setting-the-vex-s-summoner.patch} (92%) rename Spigot-Server-Patches/{0376-Add-LivingEntity-getTargetEntity.patch => 0375-Add-LivingEntity-getTargetEntity.patch} (98%) rename Spigot-Server-Patches/{0377-Add-sun-related-API.patch => 0376-Add-sun-related-API.patch} (95%) rename Spigot-Server-Patches/{0378-Check-Drowned-for-Villager-Aggression-Config.patch => 0377-Check-Drowned-for-Villager-Aggression-Config.patch} (95%) rename Spigot-Server-Patches/{0379-Here-s-Johnny.patch => 0378-Here-s-Johnny.patch} (95%) rename Spigot-Server-Patches/{0380-Turtle-API.patch => 0379-Turtle-API.patch} (98%) rename Spigot-Server-Patches/{0381-Limit-lightning-strike-effect-distance.patch => 0380-Limit-lightning-strike-effect-distance.patch} (96%) rename Spigot-Server-Patches/{0382-Implement-getters-and-setters-for-EntityItem-owner-a.patch => 0381-Implement-getters-and-setters-for-EntityItem-owner-a.patch} (97%) rename Spigot-Server-Patches/{0383-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch => 0382-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch} (96%) rename Spigot-Server-Patches/{0384-Call-player-spectator-target-events.patch => 0383-Call-player-spectator-target-events.patch} (97%) rename Spigot-Server-Patches/{0385-Add-Velocity-IP-Forwarding-Support.patch => 0384-Add-Velocity-IP-Forwarding-Support.patch} (99%) rename Spigot-Server-Patches/{0386-Add-more-Witch-API.patch => 0385-Add-more-Witch-API.patch} (99%) rename Spigot-Server-Patches/{0387-Fix-MC-93764.patch => 0386-Fix-MC-93764.patch} (90%) rename Spigot-Server-Patches/{0388-Add-option-to-prevent-players-from-moving-into-unloa.patch => 0387-Add-option-to-prevent-players-from-moving-into-unloa.patch} (96%) rename Spigot-Server-Patches/{0389-Reset-players-airTicks-on-respawn.patch => 0388-Reset-players-airTicks-on-respawn.patch} (94%) rename Spigot-Server-Patches/{0390-Strip-private-area-unicode-characters-from-signs.patch => 0389-Strip-private-area-unicode-characters-from-signs.patch} (98%) rename Spigot-Server-Patches/{0391-Don-t-sleep-after-profile-lookups-if-not-needed.patch => 0390-Don-t-sleep-after-profile-lookups-if-not-needed.patch} (95%) rename Spigot-Server-Patches/{0392-Use-more-reasonable-thread-count-default-for-bootstr.patch => 0391-Use-more-reasonable-thread-count-default-for-bootstr.patch} (94%) rename Spigot-Server-Patches/{0393-Use-EntityTypes-for-living-entities.patch => 0392-Use-EntityTypes-for-living-entities.patch} (97%) rename Spigot-Server-Patches/{0394-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch => 0393-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch} (96%) rename Spigot-Server-Patches/{0395-Optimize-World-Time-Updates.patch => 0394-Optimize-World-Time-Updates.patch} (96%) rename Spigot-Server-Patches/{0396-Restore-custom-InventoryHolder-support.patch => 0395-Restore-custom-InventoryHolder-support.patch} (96%) rename Spigot-Server-Patches/{0397-Use-Vanilla-Minecart-Speeds.patch => 0396-Use-Vanilla-Minecart-Speeds.patch} (91%) rename Spigot-Server-Patches/{0398-Fix-SpongeAbsortEvent-handling.patch => 0397-Fix-SpongeAbsortEvent-handling.patch} (96%) rename Spigot-Server-Patches/{0399-Don-t-allow-digging-into-unloaded-chunks.patch => 0398-Don-t-allow-digging-into-unloaded-chunks.patch} (94%) rename Spigot-Server-Patches/{0400-Optimize-redstone-algorithm.patch => 0399-Optimize-redstone-algorithm.patch} (99%) rename Spigot-Server-Patches/{0401-force-entity-dismount-during-teleportation.patch => 0400-force-entity-dismount-during-teleportation.patch} (98%) rename Spigot-Server-Patches/{0402-Book-Size-Limits.patch => 0401-Book-Size-Limits.patch} (98%) rename Spigot-Server-Patches/{0403-Make-the-default-permission-message-configurable.patch => 0402-Make-the-default-permission-message-configurable.patch} (96%) rename Spigot-Server-Patches/{0404-Add-more-Zombie-API.patch => 0403-Add-more-Zombie-API.patch} (98%) rename Spigot-Server-Patches/{0405-limit-the-range-at-which-we-ll-consider-an-attackabl.patch => 0404-limit-the-range-at-which-we-ll-consider-an-attackabl.patch} (94%) rename Spigot-Server-Patches/{0406-Prevent-rayTrace-from-loading-chunks.patch => 0405-Prevent-rayTrace-from-loading-chunks.patch} (94%) rename Spigot-Server-Patches/{0407-Handle-Large-Packets-disconnecting-client.patch => 0406-Handle-Large-Packets-disconnecting-client.patch} (98%) rename Spigot-Server-Patches/{0408-Lazy-init-world-storage-in-CraftOfflinePlayer.patch => 0407-Lazy-init-world-storage-in-CraftOfflinePlayer.patch} (97%) rename Spigot-Server-Patches/{0409-Add-PlayerConnectionCloseEvent.patch => 0408-Add-PlayerConnectionCloseEvent.patch} (98%) rename Spigot-Server-Patches/{0410-Prevent-Enderman-from-loading-chunks.patch => 0409-Prevent-Enderman-from-loading-chunks.patch} (96%) rename Spigot-Server-Patches/{0411-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0410-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (98%) rename Spigot-Server-Patches/{0412-Fix-PlayerEditBookEvent.patch => 0411-Fix-PlayerEditBookEvent.patch} (96%) rename Spigot-Server-Patches/{0413-Workaround-for-vehicle-tracking-issue-on-disconnect.patch => 0412-Workaround-for-vehicle-tracking-issue-on-disconnect.patch} (89%) rename Spigot-Server-Patches/{0414-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch => 0413-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch} (97%) rename Spigot-Server-Patches/{0415-Block-Entity-remove-from-being-called-on-Players.patch => 0414-Block-Entity-remove-from-being-called-on-Players.patch} (95%) rename Spigot-Server-Patches/{0416-Allow-Saving-of-Oversized-Chunks.patch => 0415-Allow-Saving-of-Oversized-Chunks.patch} (99%) rename Spigot-Server-Patches/{0417-BlockDestroyEvent.patch => 0416-BlockDestroyEvent.patch} (94%) rename Spigot-Server-Patches/{0418-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch => 0417-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch} (96%) rename Spigot-Server-Patches/{0419-Fix-sign-edit-memory-leak.patch => 0418-Fix-sign-edit-memory-leak.patch} (93%) rename Spigot-Server-Patches/{0420-Limit-Client-Sign-length-more.patch => 0419-Limit-Client-Sign-length-more.patch} (96%) rename Spigot-Server-Patches/{0421-Don-t-check-ConvertSigns-boolean-every-sign-save.patch => 0420-Don-t-check-ConvertSigns-boolean-every-sign-save.patch} (92%) rename Spigot-Server-Patches/{0422-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch => 0421-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch} (95%) rename Spigot-Server-Patches/{0423-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch => 0422-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch} (95%) rename Spigot-Server-Patches/{0424-Set-Zombie-last-tick-at-start-of-drowning-process.patch => 0423-Set-Zombie-last-tick-at-start-of-drowning-process.patch} (93%) diff --git a/Spigot-Server-Patches/0373-Don-t-update-snapshot-blockstates.patch b/Spigot-Server-Patches/0373-Don-t-update-snapshot-blockstates.patch deleted file mode 100644 index 608b0710b..000000000 --- a/Spigot-Server-Patches/0373-Don-t-update-snapshot-blockstates.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 47b023d5aea541dfa645790eec0d9f951e47581f Mon Sep 17 00:00:00 2001 -From: Matthew Miller -Date: Fri, 5 Oct 2018 15:46:46 +1000 -Subject: [PATCH] Don't update snapshot blockstates - - -diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 082a1b6e2..2b78fff9f 100644 ---- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -@@ -131,7 +131,11 @@ public class CraftBlockEntityState extends CraftBlockState - TileEntity tile = getTileEntityFromWorld(); - - if (isApplicable(tile)) { -- applyTo(tileEntityClass.cast(tile)); -+ // Paper start -+ if (!snapshotDisabled) { -+ applyTo(tileEntityClass.cast(tile)); -+ } -+ // Paper end - tile.update(); - } - } --- -2.20.1 - diff --git a/Spigot-Server-Patches/0374-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0373-Hook-into-CB-plugin-rewrites.patch similarity index 99% rename from Spigot-Server-Patches/0374-Hook-into-CB-plugin-rewrites.patch rename to Spigot-Server-Patches/0373-Hook-into-CB-plugin-rewrites.patch index 01e692de2..a8e8ab4c4 100644 --- a/Spigot-Server-Patches/0374-Hook-into-CB-plugin-rewrites.patch +++ b/Spigot-Server-Patches/0373-Hook-into-CB-plugin-rewrites.patch @@ -1,4 +1,4 @@ -From c6878cc4de9af2d4e7e7e75046be44a9d674eab0 Mon Sep 17 00:00:00 2001 +From 618e38761582c4edf8cb2a43fe0fe4299f85b4cc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 3 Oct 2018 20:09:18 -0400 Subject: [PATCH] Hook into CB plugin rewrites @@ -187,5 +187,5 @@ index 632df2270..b66323220 100644 { if ( owner.equals( "org/bukkit/Material" ) ) -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0375-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0374-Allow-setting-the-vex-s-summoner.patch similarity index 92% rename from Spigot-Server-Patches/0375-Allow-setting-the-vex-s-summoner.patch rename to Spigot-Server-Patches/0374-Allow-setting-the-vex-s-summoner.patch index ff8f7ccab..f13b1c94b 100644 --- a/Spigot-Server-Patches/0375-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-Server-Patches/0374-Allow-setting-the-vex-s-summoner.patch @@ -1,4 +1,4 @@ -From 0106ed8b48fc1e6916924db0b4fb09146441faab Mon Sep 17 00:00:00 2001 +From f65b131de4960742e16503f54cdbaa00e252d706 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 21:47:44 -0500 Subject: [PATCH] Allow setting the vex's summoner @@ -17,7 +17,7 @@ index c3864b869..589b13f4e 100644 this.b = entityinsentient; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java -index 927ed9a9a..c23b1e960 100644 +index c96a5df80..b09da64c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java @@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex { @@ -32,5 +32,5 @@ index 927ed9a9a..c23b1e960 100644 @Override -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0376-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0375-Add-LivingEntity-getTargetEntity.patch similarity index 98% rename from Spigot-Server-Patches/0376-Add-LivingEntity-getTargetEntity.patch rename to Spigot-Server-Patches/0375-Add-LivingEntity-getTargetEntity.patch index 93f685147..cc4c05d2e 100644 --- a/Spigot-Server-Patches/0376-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-Server-Patches/0375-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From 746dd31d5b5a6c829094277c7d84c9885e7a53b5 Mon Sep 17 00:00:00 2001 +From 1389043974ddcad9244bc0da76131f1617acd772 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:33:08 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity @@ -71,7 +71,7 @@ index 66947e307..2f27af7f6 100644 return this.d(this.pitch, this.yaw); } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 56191d1f2..9815509c4 100644 +index f48ddbc68..1023505d1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3,6 +3,8 @@ package net.minecraft.server; @@ -180,5 +180,5 @@ index eeab59379..d6a4bc64a 100644 public List getLastTwoTargetBlocks(Set transparent, int maxDistance) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0377-Add-sun-related-API.patch b/Spigot-Server-Patches/0376-Add-sun-related-API.patch similarity index 95% rename from Spigot-Server-Patches/0377-Add-sun-related-API.patch rename to Spigot-Server-Patches/0376-Add-sun-related-API.patch index 54fbb058e..33369d974 100644 --- a/Spigot-Server-Patches/0377-Add-sun-related-API.patch +++ b/Spigot-Server-Patches/0376-Add-sun-related-API.patch @@ -1,4 +1,4 @@ -From 51a4262ce2049f9e801b2cef281f7685d90d9e12 Mon Sep 17 00:00:00 2001 +From 33a5df37206b4248b9222b910d76b8db5b416717 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:21 -0500 Subject: [PATCH] Add sun related API @@ -17,7 +17,7 @@ index ee5078370..3059682a4 100644 if (this.world.L() && !this.world.isClientSide) { float f = this.az(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 21cfcb50d..5a447f8ef 100644 +index 2e48ea9d8..a21de9b3d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -829,6 +829,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -61,5 +61,5 @@ index 53c2d154e..40a429942 100644 + // Paper end } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0378-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0377-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 95% rename from Spigot-Server-Patches/0378-Check-Drowned-for-Villager-Aggression-Config.patch rename to Spigot-Server-Patches/0377-Check-Drowned-for-Villager-Aggression-Config.patch index 841701c6a..e5df4c96c 100644 --- a/Spigot-Server-Patches/0378-Check-Drowned-for-Villager-Aggression-Config.patch +++ b/Spigot-Server-Patches/0377-Check-Drowned-for-Villager-Aggression-Config.patch @@ -1,4 +1,4 @@ -From 68fc8e5d30c62ffd151f060f2e254290acbf5def Mon Sep 17 00:00:00 2001 +From b7a4b50fde9a7975ccacc28736b603b50700ca2d Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 10 Oct 2018 21:22:44 -0500 Subject: [PATCH] Check Drowned for Villager Aggression Config @@ -18,5 +18,5 @@ index b861c623c..0e2b5ee74 100644 this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bC)); } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0379-Here-s-Johnny.patch b/Spigot-Server-Patches/0378-Here-s-Johnny.patch similarity index 95% rename from Spigot-Server-Patches/0379-Here-s-Johnny.patch rename to Spigot-Server-Patches/0378-Here-s-Johnny.patch index 1f3a84ff1..c11f37d07 100644 --- a/Spigot-Server-Patches/0379-Here-s-Johnny.patch +++ b/Spigot-Server-Patches/0378-Here-s-Johnny.patch @@ -1,4 +1,4 @@ -From e739514008a416c57fecdd4af511f4e3cd94d3e1 Mon Sep 17 00:00:00 2001 +From 42f526586cf29b7db63d23fa91b0ccdb37d26fc7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:22 -0500 Subject: [PATCH] Here's Johnny! @@ -37,5 +37,5 @@ index 951d47929..5ff957ced 100644 + // Paper end } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0380-Turtle-API.patch b/Spigot-Server-Patches/0379-Turtle-API.patch similarity index 98% rename from Spigot-Server-Patches/0380-Turtle-API.patch rename to Spigot-Server-Patches/0379-Turtle-API.patch index b885fe854..dee732f5c 100644 --- a/Spigot-Server-Patches/0380-Turtle-API.patch +++ b/Spigot-Server-Patches/0379-Turtle-API.patch @@ -1,4 +1,4 @@ -From 1a1e746ec859f87d4c53d2081b1488ea9edcc2da Mon Sep 17 00:00:00 2001 +From 87e673dd88d661f1de4ac358769da08aff8f5abd Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 29 Sep 2018 16:08:23 -0500 Subject: [PATCH] Turtle API @@ -153,5 +153,5 @@ index 123a2c75c..8edcf7af6 100644 + // Paper end } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0381-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0380-Limit-lightning-strike-effect-distance.patch similarity index 96% rename from Spigot-Server-Patches/0381-Limit-lightning-strike-effect-distance.patch rename to Spigot-Server-Patches/0380-Limit-lightning-strike-effect-distance.patch index 5f690ccfc..a4660851a 100644 --- a/Spigot-Server-Patches/0381-Limit-lightning-strike-effect-distance.patch +++ b/Spigot-Server-Patches/0380-Limit-lightning-strike-effect-distance.patch @@ -1,11 +1,11 @@ -From 8eaa1a8c45655ea01da92e0863dd5d91cb67442b Mon Sep 17 00:00:00 2001 +From f569811682d4be7e7783f352c23de594dd0f32fa 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 e042040557..30985cdfc7 100644 +index 0b54b7d78..d723868fc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -237,6 +237,28 @@ public class PaperWorldConfig { @@ -38,7 +38,7 @@ index e042040557..30985cdfc7 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 7781babf51..50f6200095 100644 +index 7781babf5..50f620009 100644 --- a/src/main/java/net/minecraft/server/EntityLightning.java +++ b/src/main/java/net/minecraft/server/EntityLightning.java @@ -60,6 +60,17 @@ public class EntityLightning extends EntityWeather { @@ -69,7 +69,7 @@ index 7781babf51..50f6200095 100644 --this.lifeTicks; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 9b5509dce3..409b507446 100644 +index 9b5509dce..409b50744 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1064,7 +1064,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -82,5 +82,5 @@ index 9b5509dce3..409b507446 100644 } else { return false; -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0382-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0381-Implement-getters-and-setters-for-EntityItem-owner-a.patch similarity index 97% rename from Spigot-Server-Patches/0382-Implement-getters-and-setters-for-EntityItem-owner-a.patch rename to Spigot-Server-Patches/0381-Implement-getters-and-setters-for-EntityItem-owner-a.patch index 61ab5d2a9..1d7c9906e 100644 --- a/Spigot-Server-Patches/0382-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-Server-Patches/0381-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From 93753cf16547eb0b8d4d091c7338758fbaaba0e3 Mon Sep 17 00:00:00 2001 +From d9afae9a218f029fd0fb7d16214686903b85b578 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 @@ -78,5 +78,5 @@ index 6036592f7..4128ba4c0 100644 @Override -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0383-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0382-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 96% rename from Spigot-Server-Patches/0383-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to Spigot-Server-Patches/0382-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch index 55d1ecf40..04d21065c 100644 --- a/Spigot-Server-Patches/0383-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch +++ b/Spigot-Server-Patches/0382-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch @@ -1,4 +1,4 @@ -From 55a070d8173e719c8b55d416b73732e82f56419b Mon Sep 17 00:00:00 2001 +From 69de585cad7ca8533b859968de165919d6844aad 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 @@ -38,5 +38,5 @@ index 62b5b6ece..60ab1c751 100644 } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0384-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0383-Call-player-spectator-target-events.patch similarity index 97% rename from Spigot-Server-Patches/0384-Call-player-spectator-target-events.patch rename to Spigot-Server-Patches/0383-Call-player-spectator-target-events.patch index b6e4e1b1b..da0e5fa43 100644 --- a/Spigot-Server-Patches/0384-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0383-Call-player-spectator-target-events.patch @@ -1,4 +1,4 @@ -From b4e93d51a30d7dcacf71488032d9c89f0efe82a4 Mon Sep 17 00:00:00 2001 +From c911ad34ef16a86c2943ab87bdc97e688572d60c Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:32:19 -0500 Subject: [PATCH] Call player spectator target events @@ -59,5 +59,5 @@ index b01fffbd6..5757e1288 100644 protected void E() { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0385-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0384-Add-Velocity-IP-Forwarding-Support.patch similarity index 99% rename from Spigot-Server-Patches/0385-Add-Velocity-IP-Forwarding-Support.patch rename to Spigot-Server-Patches/0384-Add-Velocity-IP-Forwarding-Support.patch index 6580c88e3..14f9c9491 100644 --- a/Spigot-Server-Patches/0385-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0384-Add-Velocity-IP-Forwarding-Support.patch @@ -1,4 +1,4 @@ -From b026f4cbc07ecf81058a8212fc7edf3ef93968fa Mon Sep 17 00:00:00 2001 +From 5c5cb283667d1e7c6d6489042d74c11be98246f3 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 8 Oct 2018 14:36:14 -0400 Subject: [PATCH] Add Velocity IP Forwarding Support @@ -278,5 +278,5 @@ index 345843a7f..23c96f44b 100644 this.a = packetdataserializer.g(); this.b = packetdataserializer.l(); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0386-Add-more-Witch-API.patch b/Spigot-Server-Patches/0385-Add-more-Witch-API.patch similarity index 99% rename from Spigot-Server-Patches/0386-Add-more-Witch-API.patch rename to Spigot-Server-Patches/0385-Add-more-Witch-API.patch index 40c1393f8..358bf91c7 100644 --- a/Spigot-Server-Patches/0386-Add-more-Witch-API.patch +++ b/Spigot-Server-Patches/0385-Add-more-Witch-API.patch @@ -1,4 +1,4 @@ -From 6a93cf23a2c050edf22ed799f82ff9958edee6f3 Mon Sep 17 00:00:00 2001 +From acfbf3d5c429ad4a3a2849f087484e005550754e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 14:10:46 -0500 Subject: [PATCH] Add more Witch API @@ -136,5 +136,5 @@ index f25998eb6..ac465bda2 100644 + // Paper end } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0387-Fix-MC-93764.patch b/Spigot-Server-Patches/0386-Fix-MC-93764.patch similarity index 90% rename from Spigot-Server-Patches/0387-Fix-MC-93764.patch rename to Spigot-Server-Patches/0386-Fix-MC-93764.patch index 0e28f8ad6..af325674d 100644 --- a/Spigot-Server-Patches/0387-Fix-MC-93764.patch +++ b/Spigot-Server-Patches/0386-Fix-MC-93764.patch @@ -1,4 +1,4 @@ -From 8574c345ade629d2b25b6369d12bba50d4ab14d0 Mon Sep 17 00:00:00 2001 +From c6dc3e1af9f6a94e1a971f64e528c9e7389389c9 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Oct 2018 19:38:45 -0500 Subject: [PATCH] Fix MC-93764 @@ -18,5 +18,5 @@ index 99191f09f..4d692b7e0 100644 public boolean canRespawn() { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0388-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0387-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 96% rename from Spigot-Server-Patches/0388-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to Spigot-Server-Patches/0387-Add-option-to-prevent-players-from-moving-into-unloa.patch index feffc6282..6d0782f76 100644 --- a/Spigot-Server-Patches/0388-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/Spigot-Server-Patches/0387-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -1,4 +1,4 @@ -From 0311bc9696bff6505b6c3bca23b895f9df54991a Mon Sep 17 00:00:00 2001 +From 952fe52570c55108ab6e6412555b292c66572c6e Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Mon, 22 Oct 2018 17:34:10 +0200 Subject: [PATCH] Add option to prevent players from moving into unloaded @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d723868fc7..8210b22ebe 100644 +index d723868fc..8210b22eb 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -579,4 +579,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index d723868fc7..8210b22ebe 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 7e285c629e..0ee9e70956 100644 +index 7e285c629..0ee9e7095 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -341,6 +341,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -64,5 +64,5 @@ index 7e285c629e..0ee9e70956 100644 float f2 = this.player.dc() ? 300.0F : 100.0F; -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0389-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0388-Reset-players-airTicks-on-respawn.patch similarity index 94% rename from Spigot-Server-Patches/0389-Reset-players-airTicks-on-respawn.patch rename to Spigot-Server-Patches/0388-Reset-players-airTicks-on-respawn.patch index fd60d4463..c37c12997 100644 --- a/Spigot-Server-Patches/0389-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0388-Reset-players-airTicks-on-respawn.patch @@ -1,4 +1,4 @@ -From dbe96c4f6ce97088dfc3b17ce7e2d8273d60bf5b Mon Sep 17 00:00:00 2001 +From 0ade622d8c60ba099948cf9ea1342b0a4377ac10 Mon Sep 17 00:00:00 2001 From: GreenMeanie Date: Sat, 20 Oct 2018 22:34:02 -0400 Subject: [PATCH] Reset players airTicks on respawn @@ -30,5 +30,5 @@ index 5757e1288..005bcaac1 100644 this.fallDistance = 0; this.foodData = new FoodMetaData(this); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0390-Strip-private-area-unicode-characters-from-signs.patch b/Spigot-Server-Patches/0389-Strip-private-area-unicode-characters-from-signs.patch similarity index 98% rename from Spigot-Server-Patches/0390-Strip-private-area-unicode-characters-from-signs.patch rename to Spigot-Server-Patches/0389-Strip-private-area-unicode-characters-from-signs.patch index 609ae86de..26d03d670 100644 --- a/Spigot-Server-Patches/0390-Strip-private-area-unicode-characters-from-signs.patch +++ b/Spigot-Server-Patches/0389-Strip-private-area-unicode-characters-from-signs.patch @@ -1,4 +1,4 @@ -From e00232050f4b33f08e4b0a067bf929d46f1deaae Mon Sep 17 00:00:00 2001 +From d625e370cf321fc96b56d14b0a53b44e41f6a063 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 23 Oct 2018 20:53:43 -0400 Subject: [PATCH] Strip private area unicode characters from signs @@ -89,5 +89,5 @@ index 458d1561d..c2bcbbbab 100644 public void a(int i, IChatBaseComponent ichatbasecomponent) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0391-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0390-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 95% rename from Spigot-Server-Patches/0391-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to Spigot-Server-Patches/0390-Don-t-sleep-after-profile-lookups-if-not-needed.patch index dca7455e2..ea2f640bd 100644 --- a/Spigot-Server-Patches/0391-Don-t-sleep-after-profile-lookups-if-not-needed.patch +++ b/Spigot-Server-Patches/0390-Don-t-sleep-after-profile-lookups-if-not-needed.patch @@ -1,4 +1,4 @@ -From ca16808e99c365690366f3af724388bd936c7a7d Mon Sep 17 00:00:00 2001 +From b8f6621d12f44cf503a144ad7da7948059364e10 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 20:25:05 -0400 Subject: [PATCH] Don't sleep after profile lookups if not needed @@ -32,5 +32,5 @@ index 71e48e87b..23f1447cf 100644 try { Thread.sleep(DELAY_BETWEEN_PAGES); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0392-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0391-Use-more-reasonable-thread-count-default-for-bootstr.patch similarity index 94% rename from Spigot-Server-Patches/0392-Use-more-reasonable-thread-count-default-for-bootstr.patch rename to Spigot-Server-Patches/0391-Use-more-reasonable-thread-count-default-for-bootstr.patch index 59ce8cf0d..b5361863a 100644 --- a/Spigot-Server-Patches/0392-Use-more-reasonable-thread-count-default-for-bootstr.patch +++ b/Spigot-Server-Patches/0391-Use-more-reasonable-thread-count-default-for-bootstr.patch @@ -1,4 +1,4 @@ -From 8b4b4b534f5f133ac6395cefc4a55816618c51b4 Mon Sep 17 00:00:00 2001 +From 943ab46c33ccb6fd337b6f7c797163522c54404f Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 23:14:38 -0400 Subject: [PATCH] Use more reasonable thread count default for bootstrap @@ -18,5 +18,5 @@ index ee40bccf6..db9af361d 100644 pool.shutdown(); return fixer; -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0393-Use-EntityTypes-for-living-entities.patch b/Spigot-Server-Patches/0392-Use-EntityTypes-for-living-entities.patch similarity index 97% rename from Spigot-Server-Patches/0393-Use-EntityTypes-for-living-entities.patch rename to Spigot-Server-Patches/0392-Use-EntityTypes-for-living-entities.patch index 3b30c7d92..ea4aafbe5 100644 --- a/Spigot-Server-Patches/0393-Use-EntityTypes-for-living-entities.patch +++ b/Spigot-Server-Patches/0392-Use-EntityTypes-for-living-entities.patch @@ -1,11 +1,11 @@ -From 1955b4cdc7a21f0fba4df7983c37d6ec439f1a05 Mon Sep 17 00:00:00 2001 +From 5fd15f8a9f940b58b978dbb8364398b2acfd2059 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 4 Oct 2018 10:08:02 -0500 Subject: [PATCH] Use EntityTypes for living entities diff --git a/src/main/java/net/minecraft/server/BlockMonsterEggs.java b/src/main/java/net/minecraft/server/BlockMonsterEggs.java -index 5a0cc6d058..d385f647e7 100644 +index 5a0cc6d05..d385f647e 100644 --- a/src/main/java/net/minecraft/server/BlockMonsterEggs.java +++ b/src/main/java/net/minecraft/server/BlockMonsterEggs.java @@ -35,7 +35,7 @@ public class BlockMonsterEggs extends Block { @@ -18,7 +18,7 @@ index 5a0cc6d058..d385f647e7 100644 entitysilverfish.setPositionRotation((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, 0.0F, 0.0F); world.addEntity(entitysilverfish, SpawnReason.SILVERFISH_BLOCK); // CraftBukkit - add SpawnReason diff --git a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java -index 75622fbdf8..2653699840 100644 +index 75622fbdf..265369984 100644 --- a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java +++ b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java @@ -52,7 +52,7 @@ public class BlockPumpkinCarved extends BlockFacingHorizontal { @@ -40,7 +40,7 @@ index 75622fbdf8..2653699840 100644 entityirongolem.setPlayerCreated(true); entityirongolem.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.05D, (double) blockposition2.getZ() + 0.5D, 0.0F, 0.0F); diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java -index 0f0872c1e0..1c1bf85a0e 100644 +index 0f0872c1e..1c1bf85a0 100644 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java @@ -94,7 +94,7 @@ public class BlockTurtleEgg extends Block { @@ -53,7 +53,7 @@ index 0f0872c1e0..1c1bf85a0e 100644 entityturtle.setAgeRaw(-24000); entityturtle.g(blockposition); diff --git a/src/main/java/net/minecraft/server/BlockWitherSkull.java b/src/main/java/net/minecraft/server/BlockWitherSkull.java -index 93bf32dc1a..e6063bb462 100644 +index 93bf32dc1..e6063bb46 100644 --- a/src/main/java/net/minecraft/server/BlockWitherSkull.java +++ b/src/main/java/net/minecraft/server/BlockWitherSkull.java @@ -52,7 +52,7 @@ public class BlockWitherSkull extends BlockSkull { @@ -66,7 +66,7 @@ index 93bf32dc1a..e6063bb462 100644 entitywither.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.55D, (double) blockposition2.getZ() + 0.5D, shapedetector_shapedetectorcollection.getFacing().k() == EnumDirection.EnumAxis.X ? 0.0F : 90.0F, 0.0F); diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java -index aad7ce93f6..09eabf1235 100644 +index aad7ce93f..09eabf123 100644 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java @@ -412,7 +412,7 @@ public class EnderDragonBattle { @@ -79,7 +79,7 @@ index aad7ce93f6..09eabf1235 100644 entityenderdragon.getDragonControllerManager().setControllerPhase(DragonControllerPhase.HOLDING_PATTERN); entityenderdragon.setPositionRotation(0.0D, 128.0D, 0.0D, this.d.random.nextFloat() * 360.0F, 0.0F); diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java -index ee159e0a81..070a9e7b14 100644 +index ee159e0a8..070a9e7b1 100644 --- a/src/main/java/net/minecraft/server/EntityChicken.java +++ b/src/main/java/net/minecraft/server/EntityChicken.java @@ -96,7 +96,7 @@ public class EntityChicken extends EntityAnimal { @@ -92,7 +92,7 @@ index ee159e0a81..070a9e7b14 100644 public boolean f(ItemStack itemstack) { diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index 5874d2993c..cc53e915d7 100644 +index 5874d2993..cc53e915d 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -88,7 +88,7 @@ public class EntityCow extends EntityAnimal { @@ -105,7 +105,7 @@ index 5874d2993c..cc53e915d7 100644 public float getHeadHeight() { diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java -index 961afa5c42..a372f6508f 100644 +index 961afa5c4..a372f6508 100644 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java @@ -74,7 +74,7 @@ public class EntityEnderPearl extends EntityProjectile { @@ -118,7 +118,7 @@ index 961afa5c42..a372f6508f 100644 entityendermite.setPlayerSpawned(true); entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch); diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java -index 963b6fbb9c..fc20bbe272 100644 +index 963b6fbb9..fc20bbe27 100644 --- a/src/main/java/net/minecraft/server/EntityEvoker.java +++ b/src/main/java/net/minecraft/server/EntityEvoker.java @@ -188,8 +188,7 @@ public class EntityEvoker extends EntityIllagerWizard { @@ -132,7 +132,7 @@ index 963b6fbb9c..fc20bbe272 100644 entityvex.prepare(EntityEvoker.this.world.getDamageScaler(blockposition), (GroupDataEntity) null, (NBTTagCompound) null); entityvex.a((EntityInsentient) EntityEvoker.this); diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java -index 4e8a97c557..1b9425f3e6 100644 +index 4e8a97c55..1b9425f3e 100644 --- a/src/main/java/net/minecraft/server/EntityHorse.java +++ b/src/main/java/net/minecraft/server/EntityHorse.java @@ -208,11 +208,11 @@ public class EntityHorse extends EntityHorseAbstract { @@ -150,7 +150,7 @@ index 4e8a97c557..1b9425f3e6 100644 int j; diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java -index 72eed22eb9..65c40e72bf 100644 +index 72eed22eb..65c40e72b 100644 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java @@ -33,7 +33,7 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract { @@ -163,7 +163,7 @@ index 72eed22eb9..65c40e72bf 100644 this.a(entityageable, (EntityHorseAbstract) object); return (EntityAgeable) object; diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java -index eae2b26655..0a092acdfe 100644 +index eae2b2665..0a092acdf 100644 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java @@ -134,7 +134,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { @@ -176,7 +176,7 @@ index eae2b26655..0a092acdfe 100644 public boolean a(EntityHuman entityhuman, EnumHand enumhand) { diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java -index c23bc72fc8..a1873f557c 100644 +index c23bc72fc..a1873f557 100644 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java @@ -41,7 +41,7 @@ public class EntityHorseZombie extends EntityHorseAbstract { @@ -189,7 +189,7 @@ index c23bc72fc8..a1873f557c 100644 public boolean a(EntityHuman entityhuman, EnumHand enumhand) { diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java -index 5e19768710..82a32c61ed 100644 +index 5e1976871..82a32c61e 100644 --- a/src/main/java/net/minecraft/server/EntityLlama.java +++ b/src/main/java/net/minecraft/server/EntityLlama.java @@ -285,7 +285,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn @@ -202,7 +202,7 @@ index 5e19768710..82a32c61ed 100644 this.a(entityageable, (EntityHorseAbstract) entityllama); EntityLlama entityllama1 = (EntityLlama) entityageable; diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java -index dde9f1e61e..638dbe978d 100644 +index dde9f1e61..638dbe978 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -40,7 +40,7 @@ public class EntityMushroomCow extends EntityCow { @@ -224,7 +224,7 @@ index dde9f1e61e..638dbe978d 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index ba074c10c6..13c84bda84 100644 +index ba074c10c..13c84bda8 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -154,7 +154,7 @@ public class EntityOcelot extends EntityTameableAnimal { @@ -246,7 +246,7 @@ index ba074c10c6..13c84bda84 100644 entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); entityocelot.setAgeRaw(-24000); diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index 9dc2d8be27..d1689dc33a 100644 +index 9dc2d8be2..d1689dc33 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -153,7 +153,7 @@ public class EntityPig extends EntityAnimal { @@ -268,7 +268,7 @@ index 9dc2d8be27..d1689dc33a 100644 public boolean f(ItemStack itemstack) { diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java -index a02020d5fc..dbb534c9cd 100644 +index a02020d5f..dbb534c9c 100644 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java @@ -18,7 +18,7 @@ public class EntityPolarBear extends EntityAnimal { @@ -281,7 +281,7 @@ index a02020d5fc..dbb534c9cd 100644 public boolean f(ItemStack itemstack) { diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java -index e545b1c9b3..d6bac06a7a 100644 +index e545b1c9b..d6bac06a7 100644 --- a/src/main/java/net/minecraft/server/EntityRabbit.java +++ b/src/main/java/net/minecraft/server/EntityRabbit.java @@ -251,7 +251,7 @@ public class EntityRabbit extends EntityAnimal { @@ -294,7 +294,7 @@ index e545b1c9b3..d6bac06a7a 100644 if (this.random.nextInt(20) != 0) { diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java -index f7a25c1483..c35d1eef43 100644 +index f7a25c148..c35d1eef4 100644 --- a/src/main/java/net/minecraft/server/EntitySheep.java +++ b/src/main/java/net/minecraft/server/EntitySheep.java @@ -247,7 +247,7 @@ public class EntitySheep extends EntityAnimal { @@ -307,7 +307,7 @@ index f7a25c1483..c35d1eef43 100644 entitysheep1.setColor(this.a((EntityAnimal) this, (EntityAnimal) entitysheep)); return entitysheep1; diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java -index a42b8d554f..9ef1c9baf2 100644 +index a42b8d554..9ef1c9baf 100644 --- a/src/main/java/net/minecraft/server/EntitySpider.java +++ b/src/main/java/net/minecraft/server/EntitySpider.java @@ -111,7 +111,7 @@ public class EntitySpider extends EntityMonster { @@ -320,7 +320,7 @@ index a42b8d554f..9ef1c9baf2 100644 entityskeleton.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null); diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index a533e0eb5b..270b950820 100644 +index a533e0eb5..270b95082 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -218,7 +218,7 @@ public class EntityTurtle extends EntityAnimal { @@ -333,7 +333,7 @@ index a533e0eb5b..270b950820 100644 public boolean f(ItemStack itemstack) { diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index d74bfa1201..24ca351194 100644 +index d74bfa120..24ca35119 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -269,6 +269,7 @@ public class EntityTypes { @@ -345,7 +345,7 @@ index d74bfa1201..24ca351194 100644 public T a(World world) { return this.aT.apply(world); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index f01e776fe5..40b3ffd8ca 100644 +index f01e776fe..40b3ffd8c 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -592,7 +592,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { @@ -367,7 +367,7 @@ index f01e776fe5..40b3ffd8ca 100644 // Paper start if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityZapEvent(this, entitylightning, entitywitch).isCancelled()) { diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java -index 4f1696d018..46d8e0a1f4 100644 +index 4f1696d01..46d8e0a1f 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -342,7 +342,7 @@ public class EntityWolf extends EntityTameableAnimal { @@ -380,7 +380,7 @@ index 4f1696d018..46d8e0a1f4 100644 if (uuid != null) { diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 7998b80c17..81cc0c3b33 100644 +index 7998b80c1..81cc0c3b3 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -208,7 +208,7 @@ public class EntityZombie extends EntityMonster { @@ -420,7 +420,7 @@ index 7998b80c17..81cc0c3b33 100644 entitychicken1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F); entitychicken1.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null); diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java -index 85d402965b..0cca7b6d51 100644 +index 85d402965..0cca7b6d5 100644 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java @@ -54,7 +54,7 @@ public class EntityZombieHusk extends EntityZombie { @@ -433,7 +433,7 @@ index 85d402965b..0cca7b6d51 100644 } diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java -index 86e5fbcdab..fb96743af2 100644 +index 86e5fbcda..fb96743af 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -118,7 +118,7 @@ public class EntityZombieVillager extends EntityZombie { @@ -446,7 +446,7 @@ index 86e5fbcdab..fb96743af2 100644 entityvillager.u(this); entityvillager.setProfession(this.getProfession()); diff --git a/src/main/java/net/minecraft/server/ItemArmorStand.java b/src/main/java/net/minecraft/server/ItemArmorStand.java -index 576b3c5650..4dd0e39ec3 100644 +index 576b3c565..4dd0e39ec 100644 --- a/src/main/java/net/minecraft/server/ItemArmorStand.java +++ b/src/main/java/net/minecraft/server/ItemArmorStand.java @@ -34,7 +34,7 @@ public class ItemArmorStand extends Item { @@ -459,7 +459,7 @@ index 576b3c5650..4dd0e39ec3 100644 entityarmorstand.setPositionRotation(d0 + 0.5D, d1, d2 + 0.5D, f, 0.0F); diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java -index 5ddf66eef5..bb7e072ee1 100644 +index 5ddf66eef..bb7e072ee 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java @@ -59,7 +59,7 @@ public class MobSpawnerPhantom { @@ -472,7 +472,7 @@ index 5ddf66eef5..bb7e072ee1 100644 entityphantom.setPositionRotation(blockposition1, 0.0F, 0.0F); groupdataentity = entityphantom.prepare(difficultydamagescaler, groupdataentity, (NBTTagCompound) null); diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java -index d4fdcbdfd6..887e4461f3 100644 +index d4fdcbdfd..887e4461f 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java @@ -36,7 +36,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal { @@ -494,7 +494,7 @@ index d4fdcbdfd6..887e4461f3 100644 entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null); entityskeleton.setPosition(entityhorseabstract.locX, entityhorseabstract.locY, entityhorseabstract.locZ); diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java -index 0ac1fb53a4..509d62f6b6 100644 +index 0ac1fb53a..509d62f6b 100644 --- a/src/main/java/net/minecraft/server/VillageSiege.java +++ b/src/main/java/net/minecraft/server/VillageSiege.java @@ -134,7 +134,7 @@ public class VillageSiege { @@ -507,7 +507,7 @@ index 0ac1fb53a4..509d62f6b6 100644 } catch (Exception exception) { exception.printStackTrace(); diff --git a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java -index 94b21693e2..0a223cfe5a 100644 +index 94b21693e..0a223cfe5 100644 --- a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java +++ b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java @@ -270,7 +270,7 @@ public class WorldGenEndCityPieces { @@ -520,7 +520,7 @@ index 94b21693e2..0a223cfe5a 100644 entityshulker.setPosition((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D); entityshulker.g(blockposition); diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java -index 2def56b067..abeb4aa025 100644 +index 2def56b06..abeb4aa02 100644 --- a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java +++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java @@ -154,8 +154,7 @@ public class WorldGenFeatureOceanRuinPieces { @@ -534,7 +534,7 @@ index 2def56b067..abeb4aa025 100644 entitydrowned.setPositionRotation(blockposition, 0.0F, 0.0F); entitydrowned.prepare(generatoraccess.getDamageScaler(blockposition), (GroupDataEntity) null, (NBTTagCompound) null); diff --git a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java -index 0e7aed09d1..493a86e1bf 100644 +index 0e7aed09d..493a86e1b 100644 --- a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java +++ b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java @@ -1800,7 +1800,7 @@ public class WorldGenMonumentPieces { @@ -556,7 +556,7 @@ index 0e7aed09d1..493a86e1bf 100644 entityguardianelder.heal(entityguardianelder.getMaxHealth()); entityguardianelder.setPositionRotation((double) l + 0.5D, (double) i1, (double) j1 + 0.5D, 0.0F, 0.0F); diff --git a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java -index 5fa2987d2a..967e33b3d7 100644 +index 5fa2987d2..967e33b3d 100644 --- a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java +++ b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java @@ -1640,7 +1640,7 @@ public class WorldGenVillagePieces { @@ -578,7 +578,7 @@ index 5fa2987d2a..967e33b3d7 100644 entityvillager.setPositionRotation((double) j1 + 0.5D, (double) k1, (double) l1 + 0.5D, 0.0F, 0.0F); entityvillager.setProfession(this.c(i1, generatoraccess.m().nextInt(6))); diff --git a/src/main/java/net/minecraft/server/WorldGenWitchHut.java b/src/main/java/net/minecraft/server/WorldGenWitchHut.java -index efb0379ce3..3d8193c477 100644 +index efb0379ce..3d8193c47 100644 --- a/src/main/java/net/minecraft/server/WorldGenWitchHut.java +++ b/src/main/java/net/minecraft/server/WorldGenWitchHut.java @@ -81,7 +81,7 @@ public class WorldGenWitchHut extends WorldGenScatteredPiece { @@ -591,7 +591,7 @@ index efb0379ce3..3d8193c477 100644 entitywitch.di(); entitywitch.setPositionRotation((double) j + 0.5D, (double) i, (double) k + 0.5D, 0.0F, 0.0F); diff --git a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java -index 11010d8e12..4eb746ebb0 100644 +index 11010d8e1..4eb746ebb 100644 --- a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java +++ b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java @@ -23,14 +23,14 @@ public class WorldGenWoodlandMansionPieces { @@ -639,7 +639,7 @@ index 11010d8e12..4eb746ebb0 100644 entityvindicator.setPositionRotation(blockposition, 0.0F, 0.0F); entityvindicator.prepare(generatoraccess.getDamageScaler(new BlockPosition(entityvindicator)), (GroupDataEntity) null, (NBTTagCompound) null); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 409b507446..a4fc1e5e21 100644 +index 409b50744..a4fc1e5e2 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -494,7 +494,7 @@ public class WorldServer extends World implements IAsyncTaskHandler { @@ -652,7 +652,7 @@ index 409b507446..a4fc1e5e21 100644 entityhorseskeleton.s(true); entityhorseskeleton.setAgeRaw(0); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e33135adaa..6ed7c93550 100644 +index e33135ada..6ed7c9355 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1181,153 +1181,153 @@ public class CraftWorld implements World { @@ -868,5 +868,5 @@ index e33135adaa..6ed7c93550 100644 if (entity != null) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0394-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch b/Spigot-Server-Patches/0393-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch similarity index 96% rename from Spigot-Server-Patches/0394-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch rename to Spigot-Server-Patches/0393-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch index c8f8fbdf4..65782aaf8 100644 --- a/Spigot-Server-Patches/0394-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch +++ b/Spigot-Server-Patches/0393-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch @@ -1,4 +1,4 @@ -From efa04bb617b4d92081d8c2d9642d11458647e178 Mon Sep 17 00:00:00 2001 +From 2913846938092fc02e1860c32c140236cd601453 Mon Sep 17 00:00:00 2001 From: MisterVector Date: Thu, 1 Nov 2018 14:50:05 -0700 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block @@ -30,5 +30,5 @@ index 22378b6bc..5e595b62e 100644 iblockdata.getBlock().a(this.world, this.player, blockposition, iblockdata, tileentity, itemstack2); } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0395-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0394-Optimize-World-Time-Updates.patch similarity index 96% rename from Spigot-Server-Patches/0395-Optimize-World-Time-Updates.patch rename to Spigot-Server-Patches/0394-Optimize-World-Time-Updates.patch index 7140f161e..a920c590e 100644 --- a/Spigot-Server-Patches/0395-Optimize-World-Time-Updates.patch +++ b/Spigot-Server-Patches/0394-Optimize-World-Time-Updates.patch @@ -1,4 +1,4 @@ -From d24eb7446c41e7ece2a912698e2e1c1ef0621d79 Mon Sep 17 00:00:00 2001 +From 65b31e0965be9753538fa31f155ffae7e7813a34 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Nov 2018 23:11:51 -0400 Subject: [PATCH] Optimize World Time Updates @@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet object for every player unless they have per-player time enabled. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1dbb03a9a..4e648ee73 100644 +index 236fbafeb..ce39ea09e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1033,12 +1033,24 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati @@ -41,5 +41,5 @@ index 1dbb03a9a..4e648ee73 100644 // WorldServer worldserver; // CraftBukkit - dropped down -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0396-Restore-custom-InventoryHolder-support.patch b/Spigot-Server-Patches/0395-Restore-custom-InventoryHolder-support.patch similarity index 96% rename from Spigot-Server-Patches/0396-Restore-custom-InventoryHolder-support.patch rename to Spigot-Server-Patches/0395-Restore-custom-InventoryHolder-support.patch index 22101b2e6..73849c27d 100644 --- a/Spigot-Server-Patches/0396-Restore-custom-InventoryHolder-support.patch +++ b/Spigot-Server-Patches/0395-Restore-custom-InventoryHolder-support.patch @@ -1,4 +1,4 @@ -From 1bfc074d3d5ff315ef835d271dd27b223a18967f Mon Sep 17 00:00:00 2001 +From b69c887ab88baa8af203f67d3b73c6c591134ae1 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 5 Nov 2018 04:23:51 +0000 Subject: [PATCH] Restore custom InventoryHolder support @@ -42,5 +42,5 @@ index 23389743d..d25928e09 100644 } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0397-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0396-Use-Vanilla-Minecart-Speeds.patch similarity index 91% rename from Spigot-Server-Patches/0397-Use-Vanilla-Minecart-Speeds.patch rename to Spigot-Server-Patches/0396-Use-Vanilla-Minecart-Speeds.patch index 5a6c78cf0..dd8b140d9 100644 --- a/Spigot-Server-Patches/0397-Use-Vanilla-Minecart-Speeds.patch +++ b/Spigot-Server-Patches/0396-Use-Vanilla-Minecart-Speeds.patch @@ -1,4 +1,4 @@ -From b5e3542e353018c1dfc49d14f26cc6cf98638882 Mon Sep 17 00:00:00 2001 +From 0e08393d4f1175f2db247dda41f100af1fa5594c Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 8 Nov 2018 21:33:09 -0500 Subject: [PATCH] Use Vanilla Minecart Speeds @@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds CraftBukkit changed the values on flying speed, restore back to vanilla diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index a8a64d054..41e8a4b50 100644 +index 95b4c0eb1..f83a695a1 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -37,9 +37,9 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT @@ -23,5 +23,5 @@ index a8a64d054..41e8a4b50 100644 // CraftBukkit end -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0398-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0397-Fix-SpongeAbsortEvent-handling.patch similarity index 96% rename from Spigot-Server-Patches/0398-Fix-SpongeAbsortEvent-handling.patch rename to Spigot-Server-Patches/0397-Fix-SpongeAbsortEvent-handling.patch index efd56f58e..417329873 100644 --- a/Spigot-Server-Patches/0398-Fix-SpongeAbsortEvent-handling.patch +++ b/Spigot-Server-Patches/0397-Fix-SpongeAbsortEvent-handling.patch @@ -1,4 +1,4 @@ -From 716d9cfd127b8f01a427c2e7bece28fdb4f6434b Mon Sep 17 00:00:00 2001 +From cba8484abc54085762631a00eb1fd7542cd30a61 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Nov 2018 05:15:21 +0000 Subject: [PATCH] Fix SpongeAbsortEvent handling @@ -40,5 +40,5 @@ index 08a5acb0a..aa3547690 100644 this.dropNaturally(world, blockposition, 1.0F, i); } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0399-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0398-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 94% rename from Spigot-Server-Patches/0399-Don-t-allow-digging-into-unloaded-chunks.patch rename to Spigot-Server-Patches/0398-Don-t-allow-digging-into-unloaded-chunks.patch index 1f673760c..f1e9616ab 100644 --- a/Spigot-Server-Patches/0399-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0398-Don-t-allow-digging-into-unloaded-chunks.patch @@ -1,4 +1,4 @@ -From 09c0177d5e3e06e433091505e5246915926b92c5 Mon Sep 17 00:00:00 2001 +From 9d6140be2028e67d5181b4a6c64e318835b4794b Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Nov 2018 21:01:09 +0000 Subject: [PATCH] Don't allow digging into unloaded chunks @@ -21,5 +21,5 @@ index 0ee9e7095..1d6f70a72 100644 double d1 = this.player.locY - ((double) blockposition.getY() + 0.5D) + 1.5D; double d2 = this.player.locZ - ((double) blockposition.getZ() + 0.5D); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0400-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0399-Optimize-redstone-algorithm.patch similarity index 99% rename from Spigot-Server-Patches/0400-Optimize-redstone-algorithm.patch rename to Spigot-Server-Patches/0399-Optimize-redstone-algorithm.patch index 1370f399c..288b5c009 100644 --- a/Spigot-Server-Patches/0400-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0399-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From de0ef1fcdb2fa88d099d52b7cfb4d4cc56fb0690 Mon Sep 17 00:00:00 2001 +From 44e5517e5eee09b6e284e621e8f6081a2c6fab32 Mon Sep 17 00:00:00 2001 From: theosib Date: Thu, 27 Sep 2018 01:43:35 -0600 Subject: [PATCH] Optimize redstone algorithm @@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee Just added Bukkit's event system and took a few liberties with dead code and comment misspellings. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 8210b22ebe..f259c4e514 100644 +index 8210b22eb..f259c4e51 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -584,4 +584,14 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index 8210b22ebe..f259c4e514 100644 } diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java new file mode 100644 -index 0000000000..21d9d6d7ed +index 000000000..21d9d6d7e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -0,0 +1,910 @@ @@ -954,7 +954,7 @@ index 0000000000..21d9d6d7ed + } +} diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 48c79568fb..a09aa69444 100644 +index 48c79568f..a09aa6944 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,5 +1,7 @@ @@ -1122,7 +1122,7 @@ index 48c79568fb..a09aa69444 100644 iblockdata.a(world, blockposition, 0); world.setAir(blockposition); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index a21de9b3d5..2f12e35acb 100644 +index a21de9b3d..2f12e35ac 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -648,6 +648,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -1142,5 +1142,5 @@ index a21de9b3d5..2f12e35acb 100644 int i = 0; EnumDirection[] aenumdirection = World.a; -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0401-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0400-force-entity-dismount-during-teleportation.patch similarity index 98% rename from Spigot-Server-Patches/0401-force-entity-dismount-during-teleportation.patch rename to Spigot-Server-Patches/0400-force-entity-dismount-during-teleportation.patch index 40c4e8b47..4dfc09d3a 100644 --- a/Spigot-Server-Patches/0401-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0400-force-entity-dismount-during-teleportation.patch @@ -1,4 +1,4 @@ -From 53d0acc26fc4de7b3c54f6d6afd00c169b14d201 Mon Sep 17 00:00:00 2001 +From 11ca39a07de98adcd85da982c83abb224aa24dd3 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 15 Nov 2018 13:38:37 +0000 Subject: [PATCH] force entity dismount during teleportation @@ -90,7 +90,7 @@ index 82684dd68..dab958a04 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 9815509c4..b1d86c8e9 100644 +index 1023505d1..d134d0fae 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2479,10 +2479,13 @@ public abstract class EntityLiving extends Entity { @@ -130,5 +130,5 @@ index 005bcaac1..0ea31156b 100644 if (entity1 != entity && this.playerConnection != null) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0402-Book-Size-Limits.patch b/Spigot-Server-Patches/0401-Book-Size-Limits.patch similarity index 98% rename from Spigot-Server-Patches/0402-Book-Size-Limits.patch rename to Spigot-Server-Patches/0401-Book-Size-Limits.patch index 12acd5927..e14aec746 100644 --- a/Spigot-Server-Patches/0402-Book-Size-Limits.patch +++ b/Spigot-Server-Patches/0401-Book-Size-Limits.patch @@ -1,4 +1,4 @@ -From 0677ab1e9fd939ed9551aea120cfa0152952a3ad Mon Sep 17 00:00:00 2001 +From cc0155d6b3d5f89109443b76884e01fe443f8439 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Nov 2018 23:08:50 -0500 Subject: [PATCH] Book Size Limits @@ -78,5 +78,5 @@ index 1d6f70a72..391ecc9db 100644 PlayerConnectionUtils.ensureMainThread(packetplayinbedit, this, this.player.getWorldServer()); if (this.lastBookTick + 20 > MinecraftServer.currentTick) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0403-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0402-Make-the-default-permission-message-configurable.patch similarity index 96% rename from Spigot-Server-Patches/0403-Make-the-default-permission-message-configurable.patch rename to Spigot-Server-Patches/0402-Make-the-default-permission-message-configurable.patch index 3e6feb015..fe78b2361 100644 --- a/Spigot-Server-Patches/0403-Make-the-default-permission-message-configurable.patch +++ b/Spigot-Server-Patches/0402-Make-the-default-permission-message-configurable.patch @@ -1,4 +1,4 @@ -From 3c9cf589e4a9df0cc5c1f79c48b268730a07d39e Mon Sep 17 00:00:00 2001 +From 02927d6e0609f850d47293aec167f2e8b6427c99 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:49:56 +0000 Subject: [PATCH] Make the default permission message configurable @@ -44,5 +44,5 @@ index 59b1628e5..8d26f8d52 100644 return createProfile(uuid, null); } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0404-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0403-Add-more-Zombie-API.patch similarity index 98% rename from Spigot-Server-Patches/0404-Add-more-Zombie-API.patch rename to Spigot-Server-Patches/0403-Add-more-Zombie-API.patch index d9515511b..581a839cf 100644 --- a/Spigot-Server-Patches/0404-Add-more-Zombie-API.patch +++ b/Spigot-Server-Patches/0403-Add-more-Zombie-API.patch @@ -1,4 +1,4 @@ -From f696805bc0e5fdf6a470b3e55ae17ec7915db1f9 Mon Sep 17 00:00:00 2001 +From 3de52d9785a52885bea32ec3e8c71bb809bbb473 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:59 -0500 Subject: [PATCH] Add more Zombie API @@ -144,5 +144,5 @@ index e93ecb076..c516d3475 100644 + // Paper end } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0405-limit-the-range-at-which-we-ll-consider-an-attackabl.patch b/Spigot-Server-Patches/0404-limit-the-range-at-which-we-ll-consider-an-attackabl.patch similarity index 94% rename from Spigot-Server-Patches/0405-limit-the-range-at-which-we-ll-consider-an-attackabl.patch rename to Spigot-Server-Patches/0404-limit-the-range-at-which-we-ll-consider-an-attackabl.patch index f1de763d4..9979c32dd 100644 --- a/Spigot-Server-Patches/0405-limit-the-range-at-which-we-ll-consider-an-attackabl.patch +++ b/Spigot-Server-Patches/0404-limit-the-range-at-which-we-ll-consider-an-attackabl.patch @@ -1,4 +1,4 @@ -From be7214eca617bb458824f6fc67ef1e264bd5a024 Mon Sep 17 00:00:00 2001 +From 234636ca2d4f795adb5063070ae7ded816b17954 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 13 Nov 2018 14:01:00 +0000 Subject: [PATCH] limit the range at which we'll consider an attackable target @@ -12,7 +12,7 @@ decrease when set, allowing us to skip further checks earlier on when looking for an attackable entity diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 9338618f8..0c9fad1c8 100644 +index 2f12e35ac..a7f6288f5 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2729,8 +2729,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -31,5 +31,5 @@ index 9338618f8..0c9fad1c8 100644 if (entityhuman1.isSneaking()) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0406-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0405-Prevent-rayTrace-from-loading-chunks.patch similarity index 94% rename from Spigot-Server-Patches/0406-Prevent-rayTrace-from-loading-chunks.patch rename to Spigot-Server-Patches/0405-Prevent-rayTrace-from-loading-chunks.patch index a6ebbd611..c9fe8ffd0 100644 --- a/Spigot-Server-Patches/0406-Prevent-rayTrace-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0405-Prevent-rayTrace-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 03ee4bd78ad91dfa2bdf87aac1d08530b8da8857 Mon Sep 17 00:00:00 2001 +From a441d9367e48dd010ae069c27c94a8b9a11fc3d0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 26 Nov 2018 19:21:58 -0500 Subject: [PATCH] Prevent rayTrace from loading chunks @@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss this saves a ton of lag for when AI tries to raytrace near unloaded chunks. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0c9fad1c8..d21e6c5cb 100644 +index a7f6288f5..380ef602e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -860,7 +860,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -31,5 +31,5 @@ index 0c9fad1c8..d21e6c5cb 100644 if (!flag || iblockdata1.getMaterial() == Material.PORTAL || !iblockdata1.getCollisionShape(this, blockposition).isEmpty()) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0407-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0406-Handle-Large-Packets-disconnecting-client.patch similarity index 98% rename from Spigot-Server-Patches/0407-Handle-Large-Packets-disconnecting-client.patch rename to Spigot-Server-Patches/0406-Handle-Large-Packets-disconnecting-client.patch index 4b4508b98..8354598cd 100644 --- a/Spigot-Server-Patches/0407-Handle-Large-Packets-disconnecting-client.patch +++ b/Spigot-Server-Patches/0406-Handle-Large-Packets-disconnecting-client.patch @@ -1,4 +1,4 @@ -From 5157a6d0c9f5e3c927840ef757e326c9eb7f1d6f Mon Sep 17 00:00:00 2001 +From ecae87da966db6e21ba5895a1cf9cc83afa47975 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Nov 2018 21:18:06 -0500 Subject: [PATCH] Handle Large Packets disconnecting client @@ -113,5 +113,5 @@ index 706d84385..c0d8f8b42 100644 public PacketPlayOutWindowItems(int i, NonNullList nonnulllist) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0408-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0407-Lazy-init-world-storage-in-CraftOfflinePlayer.patch similarity index 97% rename from Spigot-Server-Patches/0408-Lazy-init-world-storage-in-CraftOfflinePlayer.patch rename to Spigot-Server-Patches/0407-Lazy-init-world-storage-in-CraftOfflinePlayer.patch index 8161e5f9a..6ee5d9f94 100644 --- a/Spigot-Server-Patches/0408-Lazy-init-world-storage-in-CraftOfflinePlayer.patch +++ b/Spigot-Server-Patches/0407-Lazy-init-world-storage-in-CraftOfflinePlayer.patch @@ -1,4 +1,4 @@ -From 3ec4b65bf97a98fc118806e2101ddd43cb34add7 Mon Sep 17 00:00:00 2001 +From 0a1a29f95e71af8ff4d2236defc3d6a7291cae6c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 11 Dec 2018 22:25:07 -0500 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer @@ -61,5 +61,5 @@ index 698cfb918..fbdb2df27 100644 public long getFirstPlayed() { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0409-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0408-Add-PlayerConnectionCloseEvent.patch similarity index 98% rename from Spigot-Server-Patches/0409-Add-PlayerConnectionCloseEvent.patch rename to Spigot-Server-Patches/0408-Add-PlayerConnectionCloseEvent.patch index 276d72440..8ee4cd4b6 100644 --- a/Spigot-Server-Patches/0409-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-Server-Patches/0408-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From 1dbb8069e6628806c9f2160deb850b2376a98fe3 Mon Sep 17 00:00:00 2001 +From d384327fb1f3ecbad9e027ec821eb18a2f89d928 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:28 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent @@ -89,5 +89,5 @@ index 0b8796d0a..553637239 100644 } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0410-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0409-Prevent-Enderman-from-loading-chunks.patch similarity index 96% rename from Spigot-Server-Patches/0410-Prevent-Enderman-from-loading-chunks.patch rename to Spigot-Server-Patches/0409-Prevent-Enderman-from-loading-chunks.patch index 5b8dc43d3..66f40ff29 100644 --- a/Spigot-Server-Patches/0410-Prevent-Enderman-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0409-Prevent-Enderman-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 1f85c94b67c1f5600c9a46632b73dd0ab06531c7 Mon Sep 17 00:00:00 2001 +From 983d7d5ef87b165edfa81c3faaa848a56e60424c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 18 Dec 2018 02:15:08 +0000 Subject: [PATCH] Prevent Enderman from loading chunks @@ -29,5 +29,5 @@ index e4aba0e0a..945040442 100644 IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320 -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0411-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0410-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 98% rename from Spigot-Server-Patches/0411-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to Spigot-Server-Patches/0410-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 7a22b14be..4c12a2fc5 100644 --- a/Spigot-Server-Patches/0411-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-Server-Patches/0410-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From c8341f62f784ce2f97a7f007cfc73f4a8b9d80ac Mon Sep 17 00:00:00 2001 +From 4d6b8594f7965849fdea5333195b8ee0225be869 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jan 2019 00:35:43 -0600 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed @@ -163,5 +163,5 @@ index a2eae5d10..36a387137 100644 @Override -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0412-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0411-Fix-PlayerEditBookEvent.patch similarity index 96% rename from Spigot-Server-Patches/0412-Fix-PlayerEditBookEvent.patch rename to Spigot-Server-Patches/0411-Fix-PlayerEditBookEvent.patch index 5269ce570..25acbe09c 100644 --- a/Spigot-Server-Patches/0412-Fix-PlayerEditBookEvent.patch +++ b/Spigot-Server-Patches/0411-Fix-PlayerEditBookEvent.patch @@ -1,4 +1,4 @@ -From a72c697a8c700ec3a3b540245003d12540516a6f Mon Sep 17 00:00:00 2001 +From b5421b0be23fc686596e60936435d80f504e70fb Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 16 Dec 2018 13:07:33 +1100 Subject: [PATCH] Fix PlayerEditBookEvent @@ -31,5 +31,5 @@ index 391ecc9db..04344a371 100644 } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0413-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0412-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 89% rename from Spigot-Server-Patches/0413-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to Spigot-Server-Patches/0412-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index c6e2d8be4..9eb1923c2 100644 --- a/Spigot-Server-Patches/0413-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0412-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,11 +1,11 @@ -From 53659657d97290f811c4da3416173e58e13e727b Mon Sep 17 00:00:00 2001 +From a0045c8cf1a254b336a6780975f3956f4eb89dd6 Mon Sep 17 00:00:00 2001 From: connorhartley Date: Mon, 7 Jan 2019 14:43:48 -0600 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index de17da9925..010749ddc3 100644 +index de17da992..010749ddc 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1113,6 +1113,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -23,5 +23,5 @@ index de17da9925..010749ddc3 100644 this.a(true, false, false); } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0414-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0413-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch similarity index 97% rename from Spigot-Server-Patches/0414-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch rename to Spigot-Server-Patches/0413-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch index b0bbe916a..ef8682a90 100644 --- a/Spigot-Server-Patches/0414-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch +++ b/Spigot-Server-Patches/0413-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch @@ -1,4 +1,4 @@ -From 8a4f6f47e16c1dd17d89711f15d63fe893b6e6d5 Mon Sep 17 00:00:00 2001 +From e69034d72f50f98e0e7816d8579856fb07d463f7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 31 Jan 2019 16:33:36 -0500 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons @@ -46,5 +46,5 @@ index dbe0ff33a..0109484e0 100644 // CraftBukkit end world.playBlockAction(blockposition, this, b0, enumdirection.a()); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0415-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0414-Block-Entity-remove-from-being-called-on-Players.patch similarity index 95% rename from Spigot-Server-Patches/0415-Block-Entity-remove-from-being-called-on-Players.patch rename to Spigot-Server-Patches/0414-Block-Entity-remove-from-being-called-on-Players.patch index 61ea3be0e..b6738e311 100644 --- a/Spigot-Server-Patches/0415-Block-Entity-remove-from-being-called-on-Players.patch +++ b/Spigot-Server-Patches/0414-Block-Entity-remove-from-being-called-on-Players.patch @@ -1,4 +1,4 @@ -From b1fbe65e97c9915976a702ee7ec2690cf20a5f55 Mon Sep 17 00:00:00 2001 +From 9ca0e55ef61f8e8a91da1955969e98e3f4ca50b7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Feb 2019 23:33:24 -0500 Subject: [PATCH] Block Entity#remove from being called on Players @@ -32,5 +32,5 @@ index 36a387137..fbe342902 100644 // Spigot start -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0416-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0415-Allow-Saving-of-Oversized-Chunks.patch similarity index 99% rename from Spigot-Server-Patches/0416-Allow-Saving-of-Oversized-Chunks.patch rename to Spigot-Server-Patches/0415-Allow-Saving-of-Oversized-Chunks.patch index 392a45e62..4f16787e4 100644 --- a/Spigot-Server-Patches/0416-Allow-Saving-of-Oversized-Chunks.patch +++ b/Spigot-Server-Patches/0415-Allow-Saving-of-Oversized-Chunks.patch @@ -1,4 +1,4 @@ -From bcbc92e8794aa43fefd2c9b0eb52cd2cee2b2cb2 Mon Sep 17 00:00:00 2001 +From 467b292a8b46213f6b39aaa5a84679a5962aa08a Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Feb 2019 01:08:19 -0500 Subject: [PATCH] Allow Saving of Oversized Chunks @@ -427,5 +427,5 @@ index 8c8b7cbab..a17e76d83 100644 laste = null; break; // Paper } catch (Exception exception) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0417-BlockDestroyEvent.patch b/Spigot-Server-Patches/0416-BlockDestroyEvent.patch similarity index 94% rename from Spigot-Server-Patches/0417-BlockDestroyEvent.patch rename to Spigot-Server-Patches/0416-BlockDestroyEvent.patch index 5dcee4af2..f0079c9ed 100644 --- a/Spigot-Server-Patches/0417-BlockDestroyEvent.patch +++ b/Spigot-Server-Patches/0416-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From 6e4b13bf79a67d16ff7c429afa6e9d7cc8673a35 Mon Sep 17 00:00:00 2001 +From eaca6ecc58e1da8df00006a3a831914106e336ad Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:20:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -11,7 +11,7 @@ floating in the air. This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ac14f562d4..8da2c3196b 100644 +index 380ef602e..4d3f88431 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -548,8 +548,20 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc @@ -37,5 +37,5 @@ index ac14f562d4..8da2c3196b 100644 iblockdata.a(this, blockposition, 0); } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0418-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0417-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 96% rename from Spigot-Server-Patches/0418-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to Spigot-Server-Patches/0417-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch index f0d91dbcf..154f682cd 100644 --- a/Spigot-Server-Patches/0418-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch +++ b/Spigot-Server-Patches/0417-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch @@ -1,4 +1,4 @@ -From 9c0b5a16f11a586c971b39cc33157c1360184145 Mon Sep 17 00:00:00 2001 +From 6b02bc4b62cb8b03cfc0f7ce3b296ff926a172e9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Jan 2019 00:08:15 -0500 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes @@ -10,7 +10,7 @@ This made the Bukkit RecipeChoice API not work for Shapeless. This reimplements vanilla logic using the same test logic as Shaped diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java -index 819b4ac2da..ea4083a45a 100644 +index 819b4ac2d..ea4083a45 100644 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java @@ -62,18 +62,47 @@ public class ShapelessRecipes implements IRecipe { @@ -66,5 +66,5 @@ index 819b4ac2da..ea4083a45a 100644 } -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0419-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0418-Fix-sign-edit-memory-leak.patch similarity index 93% rename from Spigot-Server-Patches/0419-Fix-sign-edit-memory-leak.patch rename to Spigot-Server-Patches/0418-Fix-sign-edit-memory-leak.patch index 80208d13d..fb7b624c2 100644 --- a/Spigot-Server-Patches/0419-Fix-sign-edit-memory-leak.patch +++ b/Spigot-Server-Patches/0418-Fix-sign-edit-memory-leak.patch @@ -1,4 +1,4 @@ -From da540325bd88cf730edad5ce1eb6d264f6eb543d Mon Sep 17 00:00:00 2001 +From 8b662c496a50ccf0dcc0f1349a01330fb72afb80 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Feb 2019 00:15:28 -0500 Subject: [PATCH] Fix sign edit memory leak @@ -6,7 +6,7 @@ Subject: [PATCH] Fix sign edit memory leak when a player edits a sign, a reference to their Entity is never cleand up. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 04344a3711..5c58b85388 100644 +index 04344a371..5c58b8538 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2527,7 +2527,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -19,7 +19,7 @@ index 04344a3711..5c58b85388 100644 this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit return; diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index c2bcbbbab9..fdb771317a 100644 +index c2bcbbbab..fdb771317 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -14,6 +14,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { @@ -43,5 +43,5 @@ index c2bcbbbab9..fdb771317a 100644 public EntityHuman e() { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0420-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0419-Limit-Client-Sign-length-more.patch similarity index 96% rename from Spigot-Server-Patches/0420-Limit-Client-Sign-length-more.patch rename to Spigot-Server-Patches/0419-Limit-Client-Sign-length-more.patch index 715cb780d..38132a86b 100644 --- a/Spigot-Server-Patches/0420-Limit-Client-Sign-length-more.patch +++ b/Spigot-Server-Patches/0419-Limit-Client-Sign-length-more.patch @@ -1,4 +1,4 @@ -From 7eba93a4292ea7e612ae168aa7ba7f6a9704ba9a Mon Sep 17 00:00:00 2001 +From a957c57908f15824af6f30b22a2cf02a3df9161c Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Feb 2019 22:18:40 -0500 Subject: [PATCH] Limit Client Sign length more @@ -22,7 +22,7 @@ it only impacts data sent from the client. Set -DPaper.maxSignLength=XX to change limit or -1 to disable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5c58b85388..dc8c20efb4 100644 +index 5c58b8538..dc8c20efb 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -104,6 +104,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { @@ -50,5 +50,5 @@ index 5c58b85388..dc8c20efb4 100644 } SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0421-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0420-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 92% rename from Spigot-Server-Patches/0421-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to Spigot-Server-Patches/0420-Don-t-check-ConvertSigns-boolean-every-sign-save.patch index 0e3c219a3..7f411e445 100644 --- a/Spigot-Server-Patches/0421-Don-t-check-ConvertSigns-boolean-every-sign-save.patch +++ b/Spigot-Server-Patches/0420-Don-t-check-ConvertSigns-boolean-every-sign-save.patch @@ -1,4 +1,4 @@ -From a32e8aa75982020a347efc307017e3f03b81c1c0 Mon Sep 17 00:00:00 2001 +From ed7f18ee7ffb1f8e946945efa6d20c7cae84f7ac Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 11:11:29 -0500 Subject: [PATCH] Don't check ConvertSigns boolean every sign save @@ -7,7 +7,7 @@ property lookups arent super cheap. they synchronize, validate and check security managers. diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index fdb771317a..d0a91f6755 100644 +index fdb771317..d0a91f675 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -15,6 +15,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { @@ -28,5 +28,5 @@ index fdb771317a..d0a91f6755 100644 } // CraftBukkit end -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0422-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0421-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch similarity index 95% rename from Spigot-Server-Patches/0422-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch rename to Spigot-Server-Patches/0421-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch index 15fc33713..50ff5183f 100644 --- a/Spigot-Server-Patches/0422-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch +++ b/Spigot-Server-Patches/0421-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch @@ -1,4 +1,4 @@ -From 22c5692294c0a99baaf40a6687db8acbe474dee9 Mon Sep 17 00:00:00 2001 +From 91d8d13e7f7fbc50b731814627308bae64596762 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 14:55:01 -0500 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of @@ -11,7 +11,7 @@ Use -DPaper.excessiveSignsLimit=500 to configure that limit, or -1 to disable the limit and let your players be abused. diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 553637239c..30f646e421 100644 +index 553637239..30f646e42 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -221,6 +221,15 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -31,7 +31,7 @@ index 553637239c..30f646e421 100644 // Paper start - Async-Anti-Xray - Stop dispatching further packets and return false if the peeked packet is a chunk packet which is not ready diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java -index 2d8e6a2f4a..8d0965a053 100644 +index 2d8e6a2f4..8d0965a05 100644 --- a/src/main/java/net/minecraft/server/Packet.java +++ b/src/main/java/net/minecraft/server/Packet.java @@ -11,6 +11,7 @@ public interface Packet { @@ -43,7 +43,7 @@ index 2d8e6a2f4a..8d0965a053 100644 return false; } diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 4a57e8a3ec..eb54bdb642 100644 +index 4a57e8a3e..eb54bdb64 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -23,6 +23,13 @@ public class PacketPlayOutMapChunk implements Packet { @@ -85,5 +85,5 @@ index 4a57e8a3ec..eb54bdb642 100644 if (tileentity instanceof TileEntitySkull) { TileEntitySkull.sanitizeTileEntityUUID(nbttagcompound); } // Paper -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0423-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0422-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch similarity index 95% rename from Spigot-Server-Patches/0423-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch rename to Spigot-Server-Patches/0422-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch index 75e7062b8..ec6ee209d 100644 --- a/Spigot-Server-Patches/0423-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch +++ b/Spigot-Server-Patches/0422-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch @@ -1,4 +1,4 @@ -From 7282b799a72aaea093c5d8de311afd5c928b5aa1 Mon Sep 17 00:00:00 2001 +From 7a0c2e427c2daae71e744e6f9206b3d4845aaedb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 16:12:35 -0500 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency @@ -11,7 +11,7 @@ everything to the Whitelist object. https://github.com/PaperMC/Paper/issues/1880 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index b7cde4d418..949039f89a 100644 +index b7cde4d41..949039f89 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -64,6 +64,7 @@ public class JsonList> { @@ -23,7 +23,7 @@ index b7cde4d418..949039f89a 100644 this.e = flag; } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 135d25abd2..408c382d2a 100644 +index 135d25abd..408c382d2 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -63,7 +63,7 @@ public abstract class PlayerList { @@ -62,5 +62,5 @@ index 135d25abd2..408c382d2a 100644 public List b(String s) { -- -2.20.1 +2.21.0 diff --git a/Spigot-Server-Patches/0424-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0423-Set-Zombie-last-tick-at-start-of-drowning-process.patch similarity index 93% rename from Spigot-Server-Patches/0424-Set-Zombie-last-tick-at-start-of-drowning-process.patch rename to Spigot-Server-Patches/0423-Set-Zombie-last-tick-at-start-of-drowning-process.patch index 064765ef8..5cb79a43a 100644 --- a/Spigot-Server-Patches/0424-Set-Zombie-last-tick-at-start-of-drowning-process.patch +++ b/Spigot-Server-Patches/0423-Set-Zombie-last-tick-at-start-of-drowning-process.patch @@ -1,4 +1,4 @@ -From 913bbe3923900c1c17b7bf62d8d1b4ba4e317ede Mon Sep 17 00:00:00 2001 +From 5f9210aa3404004e2486669cca9bbd90e8e941fe Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Mar 2019 02:23:28 -0500 Subject: [PATCH] Set Zombie last tick at start of drowning process