From 9db91d62a9df97d590079b377f3a4f220d3c9cbc Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 20 Jun 2020 21:06:37 -0500 Subject: [PATCH] Drop Tident#getItemStack() patch in favor of Paper's new Arrow#getItemStack() patch --- ...PI.patch => 0022-Add-more-llama-API.patch} | 2 +- ...0022-Expose-getItemStack-for-Trident.patch | 32 -------------- ...I.patch => 0023-Add-more-evoker-API.patch} | 2 +- ...-Add-getPlacementBlockData-to-World.patch} | 2 +- ...PickupItemAnimation-to-LivingEntity.patch} | 2 +- ...getPlayer-to-SkeletonHorseTrapEvent.patch} | 2 +- ...Add-LootableInventoryFirstFillEvent.patch} | 2 +- ...tyCreatePortalEvent-for-EnderDragon.patch} | 2 +- ...h => 0029-Implement-EntityMoveEvent.patch} | 2 +- ...0-Add-ItemStack-convenience-methods.patch} | 2 +- ...ent.patch => 0031-Add-BellRingEvent.patch} | 2 +- ...-Configurable-enchantment-max-level.patch} | 2 +- ...s.patch => 0033-More-anvil-controls.patch} | 2 +- ...tch => 0034-PlayerItemCooldownEvent.patch} | 2 +- ...ch => 0035-Player-invulnerabilities.patch} | 2 +- ... => 0036-Add-PrepareGrindstoneEvent.patch} | 2 +- ...=> 0075-Despawn-egg-hatches-chicken.patch} | 2 +- ...0075-Expose-getItemStack-for-Trident.patch | 42 ------------------- ...eEvent-not-firing-for-all-use-cases.patch} | 2 +- ...ons.patch => 0077-Add-sleep-options.patch} | 2 +- ...78-Option-for-hay-block-fall-damage.patch} | 2 +- ...getPlayer-to-SkeletonHorseTrapEvent.patch} | 2 +- ...Add-LootableInventoryFirstFillEvent.patch} | 2 +- ...081-Villagers-follow-emerald-blocks.patch} | 2 +- ...dd-player-death-exp-control-options.patch} | 2 +- ... 0083-Add-permission-for-F3-N-debug.patch} | 2 +- ...ch => 0084-Allow-leashing-villagers.patch} | 2 +- ...rable-search-radius-for-villagers-t.patch} | 2 +- ...6-Make-lava-flow-speed-configurable.patch} | 2 +- ...skeleton-takes-wither-damage-option.patch} | 2 +- ...> 0088-UPnP-Port-Forwarding-Service.patch} | 2 +- ...h => 0089-Implement-EntityMoveEvent.patch} | 2 +- ...-disable-saving-projectiles-to-disk.patch} | 2 +- ...091-Implement-bed-explosion-options.patch} | 2 +- ...tch => 0092-Add-item-entity-options.patch} | 2 +- ...tural-spawns-per-biome-configurable.patch} | 2 +- ...094-Configurable-void-damage-height.patch} | 2 +- ...095-Fix-the-dead-lagging-the-server.patch} | 2 +- ...mand.patch => 0096-Add-ping-command.patch} | 2 +- ...ow-loyalty-on-tridents-to-work-in-t.patch} | 4 +- ...> 0098-Configurable-server-mod-name.patch} | 2 +- ...ould-check-if-entity-can-use-portal.patch} | 2 +- ...ch => 0100-Configurable-TPS-Catchup.patch} | 2 +- ...patch => 0101-Breedable-Polar-Bears.patch} | 2 +- ...=> 0102-Configurable-jockey-options.patch} | 2 +- ...-Configurable-enchantment-max-level.patch} | 2 +- ....patch => 0104-Optimize-Chunk-Ticks.patch} | 2 +- ...figurable-beehive-generation-chance.patch} | 2 +- ...tch => 0106-Add-more-timings-timers.patch} | 2 +- ...Skip-events-if-there-s-no-listeners.patch} | 2 +- ...g-stick-should-not-update-neighbors.patch} | 2 +- ...erman-and-creeper-griefing-controls.patch} | 2 +- ...atch => 0110-Chickens-can-retaliate.patch} | 2 +- ...p-loot-bypass-mob-griefing-gamerule.patch} | 2 +- ...s.patch => 0112-More-anvil-controls.patch} | 2 +- ...ng-can-bypass-mob-griefing-gamerule.patch} | 2 +- ...ch => 0114-Player-invulnerabilities.patch} | 4 +- ...ot-strip-colors-from-death-messages.patch} | 2 +- ... => 0116-Add-PrepareGrindstoneEvent.patch} | 2 +- ...tch => 0117-Fix-reloading-paper.yml.patch} | 2 +- ...ays-increment-arrow-despawn-counter.patch} | 2 +- ...72-Fix-Add-turtle-egg-block-options.patch} | 2 +- ... 0120-MC-4-Fix-Item-position-desync.patch} | 2 +- ...0121-MC-56653-Fix-pig-zombies-aggro.patch} | 2 +- ...h => 0122-EMC-MonsterEggSpawn-Event.patch} | 2 +- ...h => 0123-PaperPR-Add-BellRingEvent.patch} | 2 +- ...124-PaperPR-PlayerItemCooldownEvent.patch} | 4 +- ... 0125-YAPFA-Disable-mojang-profiler.patch} | 2 +- 68 files changed, 69 insertions(+), 143 deletions(-) rename patches/api/{0023-Add-more-llama-API.patch => 0022-Add-more-llama-API.patch} (98%) delete mode 100644 patches/api/0022-Expose-getItemStack-for-Trident.patch rename patches/api/{0024-Add-more-evoker-API.patch => 0023-Add-more-evoker-API.patch} (94%) rename patches/api/{0025-Add-getPlacementBlockData-to-World.patch => 0024-Add-getPlacementBlockData-to-World.patch} (94%) rename patches/api/{0026-Add-playPickupItemAnimation-to-LivingEntity.patch => 0025-Add-playPickupItemAnimation-to-LivingEntity.patch} (95%) rename patches/api/{0027-Add-getPlayer-to-SkeletonHorseTrapEvent.patch => 0026-Add-getPlayer-to-SkeletonHorseTrapEvent.patch} (97%) rename patches/api/{0028-Add-LootableInventoryFirstFillEvent.patch => 0027-Add-LootableInventoryFirstFillEvent.patch} (96%) rename patches/api/{0029-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch => 0028-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch} (96%) rename patches/api/{0030-Implement-EntityMoveEvent.patch => 0029-Implement-EntityMoveEvent.patch} (97%) rename patches/api/{0031-Add-ItemStack-convenience-methods.patch => 0030-Add-ItemStack-convenience-methods.patch} (99%) rename patches/api/{0032-Add-BellRingEvent.patch => 0031-Add-BellRingEvent.patch} (97%) rename patches/api/{0033-Configurable-enchantment-max-level.patch => 0032-Configurable-enchantment-max-level.patch} (96%) rename patches/api/{0034-More-anvil-controls.patch => 0033-More-anvil-controls.patch} (98%) rename patches/api/{0035-PlayerItemCooldownEvent.patch => 0034-PlayerItemCooldownEvent.patch} (97%) rename patches/api/{0036-Player-invulnerabilities.patch => 0035-Player-invulnerabilities.patch} (95%) rename patches/api/{0037-Add-PrepareGrindstoneEvent.patch => 0036-Add-PrepareGrindstoneEvent.patch} (96%) rename patches/server/{0076-Despawn-egg-hatches-chicken.patch => 0075-Despawn-egg-hatches-chicken.patch} (98%) delete mode 100644 patches/server/0075-Expose-getItemStack-for-Trident.patch rename patches/server/{0077-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch => 0076-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch} (97%) rename patches/server/{0078-Add-sleep-options.patch => 0077-Add-sleep-options.patch} (98%) rename patches/server/{0079-Option-for-hay-block-fall-damage.patch => 0078-Option-for-hay-block-fall-damage.patch} (96%) rename patches/server/{0080-Add-getPlayer-to-SkeletonHorseTrapEvent.patch => 0079-Add-getPlayer-to-SkeletonHorseTrapEvent.patch} (96%) rename patches/server/{0081-Add-LootableInventoryFirstFillEvent.patch => 0080-Add-LootableInventoryFirstFillEvent.patch} (97%) rename patches/server/{0082-Villagers-follow-emerald-blocks.patch => 0081-Villagers-follow-emerald-blocks.patch} (98%) rename patches/server/{0083-Add-player-death-exp-control-options.patch => 0082-Add-player-death-exp-control-options.patch} (98%) rename patches/server/{0084-Add-permission-for-F3-N-debug.patch => 0083-Add-permission-for-F3-N-debug.patch} (93%) rename patches/server/{0085-Allow-leashing-villagers.patch => 0084-Allow-leashing-villagers.patch} (98%) rename patches/server/{0086-Implement-configurable-search-radius-for-villagers-t.patch => 0085-Implement-configurable-search-radius-for-villagers-t.patch} (97%) rename patches/server/{0087-Make-lava-flow-speed-configurable.patch => 0086-Make-lava-flow-speed-configurable.patch} (97%) rename patches/server/{0088-Add-wither-skeleton-takes-wither-damage-option.patch => 0087-Add-wither-skeleton-takes-wither-damage-option.patch} (97%) rename patches/server/{0089-UPnP-Port-Forwarding-Service.patch => 0088-UPnP-Port-Forwarding-Service.patch} (99%) rename patches/server/{0090-Implement-EntityMoveEvent.patch => 0089-Implement-EntityMoveEvent.patch} (96%) rename patches/server/{0091-Add-option-to-disable-saving-projectiles-to-disk.patch => 0090-Add-option-to-disable-saving-projectiles-to-disk.patch} (99%) rename patches/server/{0092-Implement-bed-explosion-options.patch => 0091-Implement-bed-explosion-options.patch} (98%) rename patches/server/{0093-Add-item-entity-options.patch => 0092-Add-item-entity-options.patch} (98%) rename patches/server/{0094-Make-natural-spawns-per-biome-configurable.patch => 0093-Make-natural-spawns-per-biome-configurable.patch} (99%) rename patches/server/{0095-Configurable-void-damage-height.patch => 0094-Configurable-void-damage-height.patch} (97%) rename patches/server/{0096-Fix-the-dead-lagging-the-server.patch => 0095-Fix-the-dead-lagging-the-server.patch} (96%) rename patches/server/{0097-Add-ping-command.patch => 0096-Add-ping-command.patch} (99%) rename patches/server/{0098-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch => 0097-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch} (96%) rename patches/server/{0099-Configurable-server-mod-name.patch => 0098-Configurable-server-mod-name.patch} (96%) rename patches/server/{0100-End-gateway-should-check-if-entity-can-use-portal.patch => 0099-End-gateway-should-check-if-entity-can-use-portal.patch} (94%) rename patches/server/{0101-Configurable-TPS-Catchup.patch => 0100-Configurable-TPS-Catchup.patch} (97%) rename patches/server/{0102-Breedable-Polar-Bears.patch => 0101-Breedable-Polar-Bears.patch} (98%) rename patches/server/{0103-Configurable-jockey-options.patch => 0102-Configurable-jockey-options.patch} (99%) rename patches/server/{0104-Configurable-enchantment-max-level.patch => 0103-Configurable-enchantment-max-level.patch} (99%) rename patches/server/{0105-Optimize-Chunk-Ticks.patch => 0104-Optimize-Chunk-Ticks.patch} (99%) rename patches/server/{0106-Add-configurable-beehive-generation-chance.patch => 0105-Add-configurable-beehive-generation-chance.patch} (99%) rename patches/server/{0107-Add-more-timings-timers.patch => 0106-Add-more-timings-timers.patch} (99%) rename patches/server/{0108-Skip-events-if-there-s-no-listeners.patch => 0107-Skip-events-if-there-s-no-listeners.patch} (96%) rename patches/server/{0109-Debug-stick-should-not-update-neighbors.patch => 0108-Debug-stick-should-not-update-neighbors.patch} (94%) rename patches/server/{0110-Add-enderman-and-creeper-griefing-controls.patch => 0109-Add-enderman-and-creeper-griefing-controls.patch} (98%) rename patches/server/{0111-Chickens-can-retaliate.patch => 0110-Chickens-can-retaliate.patch} (98%) rename patches/server/{0112-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch => 0111-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch} (97%) rename patches/server/{0113-More-anvil-controls.patch => 0112-More-anvil-controls.patch} (99%) rename patches/server/{0114-Villagers-farming-can-bypass-mob-griefing-gamerule.patch => 0113-Villagers-farming-can-bypass-mob-griefing-gamerule.patch} (97%) rename patches/server/{0115-Player-invulnerabilities.patch => 0114-Player-invulnerabilities.patch} (98%) rename patches/server/{0116-Do-not-strip-colors-from-death-messages.patch => 0115-Do-not-strip-colors-from-death-messages.patch} (94%) rename patches/server/{0117-Add-PrepareGrindstoneEvent.patch => 0116-Add-PrepareGrindstoneEvent.patch} (96%) rename patches/server/{0118-Fix-reloading-paper.yml.patch => 0117-Fix-reloading-paper.yml.patch} (94%) rename patches/server/{0119-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch => 0118-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch} (96%) rename patches/server/{0120-MC-168772-Fix-Add-turtle-egg-block-options.patch => 0119-MC-168772-Fix-Add-turtle-egg-block-options.patch} (97%) rename patches/server/{0121-MC-4-Fix-Item-position-desync.patch => 0120-MC-4-Fix-Item-position-desync.patch} (98%) rename patches/server/{0122-MC-56653-Fix-pig-zombies-aggro.patch => 0121-MC-56653-Fix-pig-zombies-aggro.patch} (98%) rename patches/server/{0123-EMC-MonsterEggSpawn-Event.patch => 0122-EMC-MonsterEggSpawn-Event.patch} (98%) rename patches/server/{0124-PaperPR-Add-BellRingEvent.patch => 0123-PaperPR-Add-BellRingEvent.patch} (97%) rename patches/server/{0125-PaperPR-PlayerItemCooldownEvent.patch => 0124-PaperPR-PlayerItemCooldownEvent.patch} (93%) rename patches/server/{0126-YAPFA-Disable-mojang-profiler.patch => 0125-YAPFA-Disable-mojang-profiler.patch} (99%) diff --git a/patches/api/0023-Add-more-llama-API.patch b/patches/api/0022-Add-more-llama-API.patch similarity index 98% rename from patches/api/0023-Add-more-llama-API.patch rename to patches/api/0022-Add-more-llama-API.patch index 7d2d6ab3d..3ab91907c 100644 --- a/patches/api/0023-Add-more-llama-API.patch +++ b/patches/api/0022-Add-more-llama-API.patch @@ -1,4 +1,4 @@ -From d75ef0f458af02fc39ab9fdd3cf6d58f1db2a18b Mon Sep 17 00:00:00 2001 +From db2a7cb27f0b3422bfd8f786c8eb23ad55fc198c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 18 Oct 2019 22:50:05 -0500 Subject: [PATCH] Add more llama API diff --git a/patches/api/0022-Expose-getItemStack-for-Trident.patch b/patches/api/0022-Expose-getItemStack-for-Trident.patch deleted file mode 100644 index 3a89627c3..000000000 --- a/patches/api/0022-Expose-getItemStack-for-Trident.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b10537f51f8d4f030942dea51aa502c6d6aaa5ef Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Fri, 18 Oct 2019 22:19:31 -0500 -Subject: [PATCH] Expose getItemStack for Trident - ---- - src/main/java/org/bukkit/entity/Trident.java | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/main/java/org/bukkit/entity/Trident.java b/src/main/java/org/bukkit/entity/Trident.java -index 3379ef9ba..27f19074e 100644 ---- a/src/main/java/org/bukkit/entity/Trident.java -+++ b/src/main/java/org/bukkit/entity/Trident.java -@@ -3,4 +3,14 @@ package org.bukkit.entity; - /** - * Represents a thrown trident. - */ --public interface Trident extends AbstractArrow { } -+public interface Trident extends AbstractArrow { -+ // Purpur start -+ /** -+ * Gets the trident itemstack that was used to spawn this trident entity -+ * -+ * @return Thrown Trident ItemStack -+ */ -+ @org.jetbrains.annotations.NotNull -+ public org.bukkit.inventory.ItemStack getItemStack(); -+ // Purpur end -+} --- -2.26.2 - diff --git a/patches/api/0024-Add-more-evoker-API.patch b/patches/api/0023-Add-more-evoker-API.patch similarity index 94% rename from patches/api/0024-Add-more-evoker-API.patch rename to patches/api/0023-Add-more-evoker-API.patch index 9c04ff87c..677674216 100644 --- a/patches/api/0024-Add-more-evoker-API.patch +++ b/patches/api/0023-Add-more-evoker-API.patch @@ -1,4 +1,4 @@ -From f1460ea4bcb96dc7d46bc6d9792953cb0cd6edc9 Mon Sep 17 00:00:00 2001 +From f6443249943ce18e3d4b7379852b7aadf34262a7 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:28:53 -0500 Subject: [PATCH] Add more evoker API diff --git a/patches/api/0025-Add-getPlacementBlockData-to-World.patch b/patches/api/0024-Add-getPlacementBlockData-to-World.patch similarity index 94% rename from patches/api/0025-Add-getPlacementBlockData-to-World.patch rename to patches/api/0024-Add-getPlacementBlockData-to-World.patch index 3ce2db2f4..1c01153bc 100644 --- a/patches/api/0025-Add-getPlacementBlockData-to-World.patch +++ b/patches/api/0024-Add-getPlacementBlockData-to-World.patch @@ -1,4 +1,4 @@ -From dd653eeabfaf9d9f215bc3698a271fa4dead52ff Mon Sep 17 00:00:00 2001 +From 3474b0cb95240f60a13d4c4fc4d7d2ecdcf95620 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 00:34:36 -0500 Subject: [PATCH] Add getPlacementBlockData to World diff --git a/patches/api/0026-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0025-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 95% rename from patches/api/0026-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/api/0025-Add-playPickupItemAnimation-to-LivingEntity.patch index ae407d4fd..6186b32b0 100644 --- a/patches/api/0026-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/patches/api/0025-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -1,4 +1,4 @@ -From 4f79e986c51d57b1174dcb9a31e3160c12ce6f16 Mon Sep 17 00:00:00 2001 +From 6172f928c68e5721317cacb90c6d32e5c45239f4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:25:05 -0500 Subject: [PATCH] Add playPickupItemAnimation to LivingEntity diff --git a/patches/api/0027-Add-getPlayer-to-SkeletonHorseTrapEvent.patch b/patches/api/0026-Add-getPlayer-to-SkeletonHorseTrapEvent.patch similarity index 97% rename from patches/api/0027-Add-getPlayer-to-SkeletonHorseTrapEvent.patch rename to patches/api/0026-Add-getPlayer-to-SkeletonHorseTrapEvent.patch index 9cfb2321f..0132e6816 100644 --- a/patches/api/0027-Add-getPlayer-to-SkeletonHorseTrapEvent.patch +++ b/patches/api/0026-Add-getPlayer-to-SkeletonHorseTrapEvent.patch @@ -1,4 +1,4 @@ -From de027d01bb94d9a600a8137ecbb99bf13a86ce1e Mon Sep 17 00:00:00 2001 +From 1f20a2388d7c234a15f667c52eb11e1e2e89153e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:35:24 -0500 Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent diff --git a/patches/api/0028-Add-LootableInventoryFirstFillEvent.patch b/patches/api/0027-Add-LootableInventoryFirstFillEvent.patch similarity index 96% rename from patches/api/0028-Add-LootableInventoryFirstFillEvent.patch rename to patches/api/0027-Add-LootableInventoryFirstFillEvent.patch index 32a2dd61d..0fd71ee49 100644 --- a/patches/api/0028-Add-LootableInventoryFirstFillEvent.patch +++ b/patches/api/0027-Add-LootableInventoryFirstFillEvent.patch @@ -1,4 +1,4 @@ -From 36b168a9396d76dc6db8cbbf72597dd8bc6eb461 Mon Sep 17 00:00:00 2001 +From f6f1059eb70c8286fafd421d629652abddeab72a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:43:10 -0500 Subject: [PATCH] Add LootableInventoryFirstFillEvent diff --git a/patches/api/0029-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch b/patches/api/0028-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch similarity index 96% rename from patches/api/0029-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch rename to patches/api/0028-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch index a794dedfa..80e5b31a1 100644 --- a/patches/api/0029-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch +++ b/patches/api/0028-Add-back-EntityCreatePortalEvent-for-EnderDragon.patch @@ -1,4 +1,4 @@ -From 8eb94328a7cc4e037d4cb02d747e278f456e2d64 Mon Sep 17 00:00:00 2001 +From b08452c2c1e0893a931b924f80972baa4d007619 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 03:53:46 -0500 Subject: [PATCH] Add back EntityCreatePortalEvent for EnderDragon diff --git a/patches/api/0030-Implement-EntityMoveEvent.patch b/patches/api/0029-Implement-EntityMoveEvent.patch similarity index 97% rename from patches/api/0030-Implement-EntityMoveEvent.patch rename to patches/api/0029-Implement-EntityMoveEvent.patch index 016f003fa..1ff546144 100644 --- a/patches/api/0030-Implement-EntityMoveEvent.patch +++ b/patches/api/0029-Implement-EntityMoveEvent.patch @@ -1,4 +1,4 @@ -From 836041611bf7c8384dbc7234ad9c2f14a572561a Mon Sep 17 00:00:00 2001 +From ed866cae2228a4924e2ddba5b9f0377170d9555f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 11 Feb 2020 21:56:38 -0600 Subject: [PATCH] Implement EntityMoveEvent diff --git a/patches/api/0031-Add-ItemStack-convenience-methods.patch b/patches/api/0030-Add-ItemStack-convenience-methods.patch similarity index 99% rename from patches/api/0031-Add-ItemStack-convenience-methods.patch rename to patches/api/0030-Add-ItemStack-convenience-methods.patch index b1c78a511..a98ef4718 100644 --- a/patches/api/0031-Add-ItemStack-convenience-methods.patch +++ b/patches/api/0030-Add-ItemStack-convenience-methods.patch @@ -1,4 +1,4 @@ -From d1a2366614a9a590a5dc8472d257294e75143af5 Mon Sep 17 00:00:00 2001 +From 28d6279d8881deed20cc24abfecddfcffefb94c2 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 15 Mar 2020 20:52:12 -0500 Subject: [PATCH] Add ItemStack convenience methods diff --git a/patches/api/0032-Add-BellRingEvent.patch b/patches/api/0031-Add-BellRingEvent.patch similarity index 97% rename from patches/api/0032-Add-BellRingEvent.patch rename to patches/api/0031-Add-BellRingEvent.patch index 365c57da4..373c5efe6 100644 --- a/patches/api/0032-Add-BellRingEvent.patch +++ b/patches/api/0031-Add-BellRingEvent.patch @@ -1,4 +1,4 @@ -From 015d95baa403e56a5b9f9c27fd3fa09817a25cfc Mon Sep 17 00:00:00 2001 +From 5b7ad2395e52a542256545223baee7b6f57e0adf Mon Sep 17 00:00:00 2001 From: Eearslya Sleiarion Date: Mon, 24 Jun 2019 21:27:39 -0700 Subject: [PATCH] Add BellRingEvent diff --git a/patches/api/0033-Configurable-enchantment-max-level.patch b/patches/api/0032-Configurable-enchantment-max-level.patch similarity index 96% rename from patches/api/0033-Configurable-enchantment-max-level.patch rename to patches/api/0032-Configurable-enchantment-max-level.patch index df6b82294..d314269d1 100644 --- a/patches/api/0033-Configurable-enchantment-max-level.patch +++ b/patches/api/0032-Configurable-enchantment-max-level.patch @@ -1,4 +1,4 @@ -From 28922f0b553d8b6c279808253b46ea87b7f02f70 Mon Sep 17 00:00:00 2001 +From eb6271ac09f62253e19664c2a5e4b28f1dd5a914 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 1 Apr 2020 19:18:29 -0500 Subject: [PATCH] Configurable enchantment max level diff --git a/patches/api/0034-More-anvil-controls.patch b/patches/api/0033-More-anvil-controls.patch similarity index 98% rename from patches/api/0034-More-anvil-controls.patch rename to patches/api/0033-More-anvil-controls.patch index 8438b0be7..37b018f52 100644 --- a/patches/api/0034-More-anvil-controls.patch +++ b/patches/api/0033-More-anvil-controls.patch @@ -1,4 +1,4 @@ -From 9171a6d0bed6ece643c54618dec8c98a80b8bd9b Mon Sep 17 00:00:00 2001 +From 3121b0887bf03835c9b9a6f1fd3fd2775af5681f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 19 Apr 2020 00:25:09 -0500 Subject: [PATCH] More anvil controls diff --git a/patches/api/0035-PlayerItemCooldownEvent.patch b/patches/api/0034-PlayerItemCooldownEvent.patch similarity index 97% rename from patches/api/0035-PlayerItemCooldownEvent.patch rename to patches/api/0034-PlayerItemCooldownEvent.patch index bfc7b41d0..89f4bb879 100644 --- a/patches/api/0035-PlayerItemCooldownEvent.patch +++ b/patches/api/0034-PlayerItemCooldownEvent.patch @@ -1,4 +1,4 @@ -From ab076fda79e34461e2877a473ecbde07c5f6eebb Mon Sep 17 00:00:00 2001 +From b5e2f3328828a98fa1521fe61725cddd2d104590 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Mon, 20 Apr 2020 13:57:13 +0200 Subject: [PATCH] PlayerItemCooldownEvent diff --git a/patches/api/0036-Player-invulnerabilities.patch b/patches/api/0035-Player-invulnerabilities.patch similarity index 95% rename from patches/api/0036-Player-invulnerabilities.patch rename to patches/api/0035-Player-invulnerabilities.patch index 731fc6e3d..2237453d6 100644 --- a/patches/api/0036-Player-invulnerabilities.patch +++ b/patches/api/0035-Player-invulnerabilities.patch @@ -1,4 +1,4 @@ -From 476e11ba739b06424b4e344f77e4eabd1afad412 Mon Sep 17 00:00:00 2001 +From 02ff3b3a31c89fa3c48f228b8637803d919d0c9c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 2 May 2020 20:55:31 -0500 Subject: [PATCH] Player invulnerabilities diff --git a/patches/api/0037-Add-PrepareGrindstoneEvent.patch b/patches/api/0036-Add-PrepareGrindstoneEvent.patch similarity index 96% rename from patches/api/0037-Add-PrepareGrindstoneEvent.patch rename to patches/api/0036-Add-PrepareGrindstoneEvent.patch index 69037fa3d..65f9466fa 100644 --- a/patches/api/0037-Add-PrepareGrindstoneEvent.patch +++ b/patches/api/0036-Add-PrepareGrindstoneEvent.patch @@ -1,4 +1,4 @@ -From 3ecd78a2fc6828c6ae662179c82a2948593640c9 Mon Sep 17 00:00:00 2001 +From 520632fdade49977988e20c07bd90d360f86418a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 18 Jun 2020 23:29:43 -0500 Subject: [PATCH] Add PrepareGrindstoneEvent diff --git a/patches/server/0076-Despawn-egg-hatches-chicken.patch b/patches/server/0075-Despawn-egg-hatches-chicken.patch similarity index 98% rename from patches/server/0076-Despawn-egg-hatches-chicken.patch rename to patches/server/0075-Despawn-egg-hatches-chicken.patch index cac2fc312..4e5018c28 100644 --- a/patches/server/0076-Despawn-egg-hatches-chicken.patch +++ b/patches/server/0075-Despawn-egg-hatches-chicken.patch @@ -1,4 +1,4 @@ -From d425a077b293b1e4368c321ba44314711eb2a6e1 Mon Sep 17 00:00:00 2001 +From ab9d1fa681708fd626c0c7a02291cd17d8bdff0c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 23:47:42 -0600 Subject: [PATCH] Despawn egg hatches chicken diff --git a/patches/server/0075-Expose-getItemStack-for-Trident.patch b/patches/server/0075-Expose-getItemStack-for-Trident.patch deleted file mode 100644 index 79daebdc6..000000000 --- a/patches/server/0075-Expose-getItemStack-for-Trident.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e10b674179217a0cabe811dd22d96dd28dcec896 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Fri, 18 Oct 2019 22:19:40 -0500 -Subject: [PATCH] Expose getItemStack for Trident - ---- - .../java/net/minecraft/server/EntityThrownTrident.java | 2 +- - .../java/org/bukkit/craftbukkit/entity/CraftTrident.java | 7 +++++++ - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java -index 59bb039ad..ed8e26aa4 100644 ---- a/src/main/java/net/minecraft/server/EntityThrownTrident.java -+++ b/src/main/java/net/minecraft/server/EntityThrownTrident.java -@@ -77,7 +77,7 @@ public class EntityThrownTrident extends EntityArrow { - } - - @Override -- protected ItemStack getItemStack() { -+ public ItemStack getItemStack() { // Purpur - protected -> public - return this.trident.cloneItemStack(); - } - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java -index 0518e6c68..63287a9b6 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTrident.java -@@ -25,4 +25,11 @@ public class CraftTrident extends CraftArrow implements Trident { - public EntityType getType() { - return EntityType.TRIDENT; - } -+ -+ // Purpur start -+ @Override -+ public org.bukkit.inventory.ItemStack getItemStack() { -+ return org.bukkit.craftbukkit.inventory.CraftItemStack.asBukkitCopy(getHandle().getItemStack()); -+ } -+ // Purpur end - } --- -2.26.2 - diff --git a/patches/server/0077-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/server/0076-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 97% rename from patches/server/0077-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/server/0076-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index 4224afb8e..2dc748509 100644 --- a/patches/server/0077-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/server/0076-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -1,4 +1,4 @@ -From 9bebb70c4071f92b1317115e42b71ef628ee5631 Mon Sep 17 00:00:00 2001 +From 324ade06e16035915b27500e54ab4fb1f1c29a32 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 01:42:50 -0500 Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases diff --git a/patches/server/0078-Add-sleep-options.patch b/patches/server/0077-Add-sleep-options.patch similarity index 98% rename from patches/server/0078-Add-sleep-options.patch rename to patches/server/0077-Add-sleep-options.patch index f242abe5d..76ae93017 100644 --- a/patches/server/0078-Add-sleep-options.patch +++ b/patches/server/0077-Add-sleep-options.patch @@ -1,4 +1,4 @@ -From 0f863a2f9ef019645eaf659efc0fbdd135caef40 Mon Sep 17 00:00:00 2001 +From ace26bd42b6a6b5de262a011df936981c281c91e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 30 Nov 2019 03:30:17 -0600 Subject: [PATCH] Add sleep options diff --git a/patches/server/0079-Option-for-hay-block-fall-damage.patch b/patches/server/0078-Option-for-hay-block-fall-damage.patch similarity index 96% rename from patches/server/0079-Option-for-hay-block-fall-damage.patch rename to patches/server/0078-Option-for-hay-block-fall-damage.patch index 63cc6264d..3c5c387aa 100644 --- a/patches/server/0079-Option-for-hay-block-fall-damage.patch +++ b/patches/server/0078-Option-for-hay-block-fall-damage.patch @@ -1,4 +1,4 @@ -From 56ff33caeb30d23da17cfc109c2aa90e290fe7ca Mon Sep 17 00:00:00 2001 +From 670ad16925b34ff2bf80abea7613073586291c86 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 30 Nov 2019 01:31:09 -0600 Subject: [PATCH] Option for hay block fall damage diff --git a/patches/server/0080-Add-getPlayer-to-SkeletonHorseTrapEvent.patch b/patches/server/0079-Add-getPlayer-to-SkeletonHorseTrapEvent.patch similarity index 96% rename from patches/server/0080-Add-getPlayer-to-SkeletonHorseTrapEvent.patch rename to patches/server/0079-Add-getPlayer-to-SkeletonHorseTrapEvent.patch index 603fb3b01..921673b71 100644 --- a/patches/server/0080-Add-getPlayer-to-SkeletonHorseTrapEvent.patch +++ b/patches/server/0079-Add-getPlayer-to-SkeletonHorseTrapEvent.patch @@ -1,4 +1,4 @@ -From 26ec61f54554a0718d2beda5f5a8d0aee58b724b Mon Sep 17 00:00:00 2001 +From 8e48776996b8bb36d3834d576e20a70ffd0f332b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:35:35 -0500 Subject: [PATCH] Add getPlayer to SkeletonHorseTrapEvent diff --git a/patches/server/0081-Add-LootableInventoryFirstFillEvent.patch b/patches/server/0080-Add-LootableInventoryFirstFillEvent.patch similarity index 97% rename from patches/server/0081-Add-LootableInventoryFirstFillEvent.patch rename to patches/server/0080-Add-LootableInventoryFirstFillEvent.patch index 0154fbccc..646548f00 100644 --- a/patches/server/0081-Add-LootableInventoryFirstFillEvent.patch +++ b/patches/server/0080-Add-LootableInventoryFirstFillEvent.patch @@ -1,4 +1,4 @@ -From 75cfb6ec2610c568bae8a6dda00f45e906ae1612 Mon Sep 17 00:00:00 2001 +From 5cb92f4ecb97c800374f4c632b3f3c371241a0c9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 19 Oct 2019 02:43:17 -0500 Subject: [PATCH] Add LootableInventoryFirstFillEvent diff --git a/patches/server/0082-Villagers-follow-emerald-blocks.patch b/patches/server/0081-Villagers-follow-emerald-blocks.patch similarity index 98% rename from patches/server/0082-Villagers-follow-emerald-blocks.patch rename to patches/server/0081-Villagers-follow-emerald-blocks.patch index 53244f9bf..7465b26c8 100644 --- a/patches/server/0082-Villagers-follow-emerald-blocks.patch +++ b/patches/server/0081-Villagers-follow-emerald-blocks.patch @@ -1,4 +1,4 @@ -From 19e6faba58e550dc1e079ec3ee6e18d3a22ea2db Mon Sep 17 00:00:00 2001 +From 284ff850e9d523d2465658b3b4c6c219eadee509 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 29 Nov 2019 22:10:12 -0600 Subject: [PATCH] Villagers follow emerald blocks diff --git a/patches/server/0083-Add-player-death-exp-control-options.patch b/patches/server/0082-Add-player-death-exp-control-options.patch similarity index 98% rename from patches/server/0083-Add-player-death-exp-control-options.patch rename to patches/server/0082-Add-player-death-exp-control-options.patch index 2b5737f18..f685f41fb 100644 --- a/patches/server/0083-Add-player-death-exp-control-options.patch +++ b/patches/server/0082-Add-player-death-exp-control-options.patch @@ -1,4 +1,4 @@ -From 92ca7e1fa2b6587b860228b834de3e7afbf8c119 Mon Sep 17 00:00:00 2001 +From 1cb56387d6a23b9496102a3022d2ad9ee58280da Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Dec 2019 22:08:37 -0600 Subject: [PATCH] Add player death exp control options diff --git a/patches/server/0084-Add-permission-for-F3-N-debug.patch b/patches/server/0083-Add-permission-for-F3-N-debug.patch similarity index 93% rename from patches/server/0084-Add-permission-for-F3-N-debug.patch rename to patches/server/0083-Add-permission-for-F3-N-debug.patch index a170bfb98..c485c9a0d 100644 --- a/patches/server/0084-Add-permission-for-F3-N-debug.patch +++ b/patches/server/0083-Add-permission-for-F3-N-debug.patch @@ -1,4 +1,4 @@ -From d0cec740c83328fb65a0ca8c25763f31c4f16d8b Mon Sep 17 00:00:00 2001 +From 6c73c93a24c4766149576a59e16d7e7ab031e149 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 28 Dec 2019 04:21:54 -0600 Subject: [PATCH] Add permission for F3+N debug diff --git a/patches/server/0085-Allow-leashing-villagers.patch b/patches/server/0084-Allow-leashing-villagers.patch similarity index 98% rename from patches/server/0085-Allow-leashing-villagers.patch rename to patches/server/0084-Allow-leashing-villagers.patch index 0e0827cb5..f849cc3b9 100644 --- a/patches/server/0085-Allow-leashing-villagers.patch +++ b/patches/server/0084-Allow-leashing-villagers.patch @@ -1,4 +1,4 @@ -From 79dd41722e6a0fd20c5c84f6ed83b6eb25a56a40 Mon Sep 17 00:00:00 2001 +From 2e855c9499f82ddbf21cbd5e1e33d5d5d9e1250c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 3 Oct 2019 18:08:03 -0500 Subject: [PATCH] Allow leashing villagers diff --git a/patches/server/0086-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0085-Implement-configurable-search-radius-for-villagers-t.patch similarity index 97% rename from patches/server/0086-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0085-Implement-configurable-search-radius-for-villagers-t.patch index 0489941df..8907487b0 100644 --- a/patches/server/0086-Implement-configurable-search-radius-for-villagers-t.patch +++ b/patches/server/0085-Implement-configurable-search-radius-for-villagers-t.patch @@ -1,4 +1,4 @@ -From 2956498159128f608aa1b247a50bb542a496b507 Mon Sep 17 00:00:00 2001 +From fdca75e7798f5c40990ede9e078f8e68587c9530 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 22 Jul 2019 17:32:17 -0500 Subject: [PATCH] Implement configurable search radius for villagers to spawn diff --git a/patches/server/0087-Make-lava-flow-speed-configurable.patch b/patches/server/0086-Make-lava-flow-speed-configurable.patch similarity index 97% rename from patches/server/0087-Make-lava-flow-speed-configurable.patch rename to patches/server/0086-Make-lava-flow-speed-configurable.patch index 2f37657b3..8b2eadab0 100644 --- a/patches/server/0087-Make-lava-flow-speed-configurable.patch +++ b/patches/server/0086-Make-lava-flow-speed-configurable.patch @@ -1,4 +1,4 @@ -From 2ad07e4e8cf50edf8c2c9a8558941a2cecbdbc57 Mon Sep 17 00:00:00 2001 +From e1fc4760dc7cf41b2258c1351cad5246f733429b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 11:31:36 -0600 Subject: [PATCH] Make lava flow speed configurable diff --git a/patches/server/0088-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0087-Add-wither-skeleton-takes-wither-damage-option.patch similarity index 97% rename from patches/server/0088-Add-wither-skeleton-takes-wither-damage-option.patch rename to patches/server/0087-Add-wither-skeleton-takes-wither-damage-option.patch index 75392a21b..72ec5bcdb 100644 --- a/patches/server/0088-Add-wither-skeleton-takes-wither-damage-option.patch +++ b/patches/server/0087-Add-wither-skeleton-takes-wither-damage-option.patch @@ -1,4 +1,4 @@ -From c9273015b40bdffe3e7cb4fdc7736de1e6f5aa0b Mon Sep 17 00:00:00 2001 +From 02fc90e6d67242d23da3b9f79ff650bd100240aa Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 14 Jan 2020 19:43:40 -0600 Subject: [PATCH] Add wither skeleton takes wither damage option diff --git a/patches/server/0089-UPnP-Port-Forwarding-Service.patch b/patches/server/0088-UPnP-Port-Forwarding-Service.patch similarity index 99% rename from patches/server/0089-UPnP-Port-Forwarding-Service.patch rename to patches/server/0088-UPnP-Port-Forwarding-Service.patch index f4ad034f8..f5db87def 100644 --- a/patches/server/0089-UPnP-Port-Forwarding-Service.patch +++ b/patches/server/0088-UPnP-Port-Forwarding-Service.patch @@ -1,4 +1,4 @@ -From 57fa86c225f61c3853117c13638b425715d53c50 Mon Sep 17 00:00:00 2001 +From cbe470f55a4b73c26d920e28b5a34244ccbfb9cf Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 22 Jan 2020 20:13:40 -0600 Subject: [PATCH] UPnP Port Forwarding Service diff --git a/patches/server/0090-Implement-EntityMoveEvent.patch b/patches/server/0089-Implement-EntityMoveEvent.patch similarity index 96% rename from patches/server/0090-Implement-EntityMoveEvent.patch rename to patches/server/0089-Implement-EntityMoveEvent.patch index afe50976a..0d77590a7 100644 --- a/patches/server/0090-Implement-EntityMoveEvent.patch +++ b/patches/server/0089-Implement-EntityMoveEvent.patch @@ -1,4 +1,4 @@ -From c6367af96cad3abb8f53f1f67dc7ed78f2ead29f Mon Sep 17 00:00:00 2001 +From ba39fe270c169902970625051d27f30b23d54dc9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 11 Feb 2020 21:56:48 -0600 Subject: [PATCH] Implement EntityMoveEvent diff --git a/patches/server/0091-Add-option-to-disable-saving-projectiles-to-disk.patch b/patches/server/0090-Add-option-to-disable-saving-projectiles-to-disk.patch similarity index 99% rename from patches/server/0091-Add-option-to-disable-saving-projectiles-to-disk.patch rename to patches/server/0090-Add-option-to-disable-saving-projectiles-to-disk.patch index f4e68c9c2..0845ee84b 100644 --- a/patches/server/0091-Add-option-to-disable-saving-projectiles-to-disk.patch +++ b/patches/server/0090-Add-option-to-disable-saving-projectiles-to-disk.patch @@ -1,4 +1,4 @@ -From d15dafad3161b283965161bcd83c0e2f608fb010 Mon Sep 17 00:00:00 2001 +From 712f5b54a7f584f4299d2643945661221eb2593d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 18 Feb 2020 20:07:08 -0600 Subject: [PATCH] Add option to disable saving projectiles to disk diff --git a/patches/server/0092-Implement-bed-explosion-options.patch b/patches/server/0091-Implement-bed-explosion-options.patch similarity index 98% rename from patches/server/0092-Implement-bed-explosion-options.patch rename to patches/server/0091-Implement-bed-explosion-options.patch index 13986a679..ea5a5ef0e 100644 --- a/patches/server/0092-Implement-bed-explosion-options.patch +++ b/patches/server/0091-Implement-bed-explosion-options.patch @@ -1,4 +1,4 @@ -From b014b34988129b072bdc1e2636521406e98102a7 Mon Sep 17 00:00:00 2001 +From 6dc574dbdbe31a99b139d32473070ac089288cc8 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 22 Feb 2020 15:04:29 -0600 Subject: [PATCH] Implement bed explosion options diff --git a/patches/server/0093-Add-item-entity-options.patch b/patches/server/0092-Add-item-entity-options.patch similarity index 98% rename from patches/server/0093-Add-item-entity-options.patch rename to patches/server/0092-Add-item-entity-options.patch index d4fa6d349..f1c34c477 100644 --- a/patches/server/0093-Add-item-entity-options.patch +++ b/patches/server/0092-Add-item-entity-options.patch @@ -1,4 +1,4 @@ -From 04319c50a3ac3023adf72f4209ec5b57464a636f Mon Sep 17 00:00:00 2001 +From 803cabc8255b5c859f12d23d9b40c48e97dc0789 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 22 Feb 2020 15:54:08 -0600 Subject: [PATCH] Add item entity options diff --git a/patches/server/0094-Make-natural-spawns-per-biome-configurable.patch b/patches/server/0093-Make-natural-spawns-per-biome-configurable.patch similarity index 99% rename from patches/server/0094-Make-natural-spawns-per-biome-configurable.patch rename to patches/server/0093-Make-natural-spawns-per-biome-configurable.patch index a71313def..de4ba4529 100644 --- a/patches/server/0094-Make-natural-spawns-per-biome-configurable.patch +++ b/patches/server/0093-Make-natural-spawns-per-biome-configurable.patch @@ -1,4 +1,4 @@ -From 99a4a1ff5afd0d395ef5fab555743441f60e616e Mon Sep 17 00:00:00 2001 +From bbb6f2f3b18209e87ea8c20a18e88a90eac64f7e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 27 Feb 2020 13:39:06 -0600 Subject: [PATCH] Make natural spawns per biome configurable diff --git a/patches/server/0095-Configurable-void-damage-height.patch b/patches/server/0094-Configurable-void-damage-height.patch similarity index 97% rename from patches/server/0095-Configurable-void-damage-height.patch rename to patches/server/0094-Configurable-void-damage-height.patch index b36671b8f..f22e01764 100644 --- a/patches/server/0095-Configurable-void-damage-height.patch +++ b/patches/server/0094-Configurable-void-damage-height.patch @@ -1,4 +1,4 @@ -From 8ee208d56db71cdc6ebaa58e4ec41a207b817e87 Mon Sep 17 00:00:00 2001 +From ea7f180ce6845e25f45c03d5c90c73b36f6c5cac Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 27 Feb 2020 21:42:19 -0600 Subject: [PATCH] Configurable void damage height diff --git a/patches/server/0096-Fix-the-dead-lagging-the-server.patch b/patches/server/0095-Fix-the-dead-lagging-the-server.patch similarity index 96% rename from patches/server/0096-Fix-the-dead-lagging-the-server.patch rename to patches/server/0095-Fix-the-dead-lagging-the-server.patch index b8094eee4..2c08f64ba 100644 --- a/patches/server/0096-Fix-the-dead-lagging-the-server.patch +++ b/patches/server/0095-Fix-the-dead-lagging-the-server.patch @@ -1,4 +1,4 @@ -From b6593875f6295967977bb7df7397bbc7de3b900b Mon Sep 17 00:00:00 2001 +From 151f9b4605ac2ec1d7788f860ad5d331e25754a6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 6 Mar 2020 13:37:26 -0600 Subject: [PATCH] Fix the dead lagging the server diff --git a/patches/server/0097-Add-ping-command.patch b/patches/server/0096-Add-ping-command.patch similarity index 99% rename from patches/server/0097-Add-ping-command.patch rename to patches/server/0096-Add-ping-command.patch index 7e53e45c4..5262e9951 100644 --- a/patches/server/0097-Add-ping-command.patch +++ b/patches/server/0096-Add-ping-command.patch @@ -1,4 +1,4 @@ -From 4eecea21cef90813c2146f04ed615fbcce3104a4 Mon Sep 17 00:00:00 2001 +From e6af557e52c617e3ee4ef0931ce39c2a0829e52b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 13 Mar 2020 22:29:10 -0500 Subject: [PATCH] Add /ping command diff --git a/patches/server/0098-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0097-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch similarity index 96% rename from patches/server/0098-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch rename to patches/server/0097-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch index 0d78ce171..381935d39 100644 --- a/patches/server/0098-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch +++ b/patches/server/0097-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch @@ -1,4 +1,4 @@ -From 61a6efa1c75f844cfe4d8e36970f701ea23cf6f4 Mon Sep 17 00:00:00 2001 +From f6a2f4d519f4f8b64162fefbfb1de88a8e654c5c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 19 Mar 2020 19:39:34 -0500 Subject: [PATCH] Add option to allow loyalty on tridents to work in the void @@ -9,7 +9,7 @@ Subject: [PATCH] Add option to allow loyalty on tridents to work in the void 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityThrownTrident.java b/src/main/java/net/minecraft/server/EntityThrownTrident.java -index ed8e26aa4..ca6c0ec29 100644 +index 59bb039ad..b975cc7fb 100644 --- a/src/main/java/net/minecraft/server/EntityThrownTrident.java +++ b/src/main/java/net/minecraft/server/EntityThrownTrident.java @@ -38,7 +38,7 @@ public class EntityThrownTrident extends EntityArrow { diff --git a/patches/server/0099-Configurable-server-mod-name.patch b/patches/server/0098-Configurable-server-mod-name.patch similarity index 96% rename from patches/server/0099-Configurable-server-mod-name.patch rename to patches/server/0098-Configurable-server-mod-name.patch index 947a0687f..44494ee5f 100644 --- a/patches/server/0099-Configurable-server-mod-name.patch +++ b/patches/server/0098-Configurable-server-mod-name.patch @@ -1,4 +1,4 @@ -From a6328f61740886172bbdb27c1eb88fb4b51d6650 Mon Sep 17 00:00:00 2001 +From 9fd9d6cc9145840f9407ba06cac930d39d480d94 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 21 Mar 2020 11:47:39 -0500 Subject: [PATCH] Configurable server mod name diff --git a/patches/server/0100-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0099-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 94% rename from patches/server/0100-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0099-End-gateway-should-check-if-entity-can-use-portal.patch index 9ea474ee4..7aa9aa939 100644 --- a/patches/server/0100-End-gateway-should-check-if-entity-can-use-portal.patch +++ b/patches/server/0099-End-gateway-should-check-if-entity-can-use-portal.patch @@ -1,4 +1,4 @@ -From 9f22c699aeb8bb9426f86c11f9b5d5b9d2db6de3 Mon Sep 17 00:00:00 2001 +From 880fd629acbb50e1198acaf479127bfebe3817d6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 21 Mar 2020 18:33:05 -0500 Subject: [PATCH] End gateway should check if entity can use portal diff --git a/patches/server/0101-Configurable-TPS-Catchup.patch b/patches/server/0100-Configurable-TPS-Catchup.patch similarity index 97% rename from patches/server/0101-Configurable-TPS-Catchup.patch rename to patches/server/0100-Configurable-TPS-Catchup.patch index b808cb859..f46c812df 100644 --- a/patches/server/0101-Configurable-TPS-Catchup.patch +++ b/patches/server/0100-Configurable-TPS-Catchup.patch @@ -1,4 +1,4 @@ -From 929f8c699620583a084fba59d3d7ae17d231017e Mon Sep 17 00:00:00 2001 +From 68b264656f252e5a829e2a70024ffe9e74fb8e6c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Mar 2020 19:06:22 -0500 Subject: [PATCH] Configurable TPS Catchup diff --git a/patches/server/0102-Breedable-Polar-Bears.patch b/patches/server/0101-Breedable-Polar-Bears.patch similarity index 98% rename from patches/server/0102-Breedable-Polar-Bears.patch rename to patches/server/0101-Breedable-Polar-Bears.patch index 98929454e..f3b5ca71c 100644 --- a/patches/server/0102-Breedable-Polar-Bears.patch +++ b/patches/server/0101-Breedable-Polar-Bears.patch @@ -1,4 +1,4 @@ -From 3b0ee494b672eeaa145b503b696fdc7d17a50825 Mon Sep 17 00:00:00 2001 +From 1ee64e547cf37152de6744d3774470e7a29f945e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Mar 2020 19:46:44 -0500 Subject: [PATCH] Breedable Polar Bears diff --git a/patches/server/0103-Configurable-jockey-options.patch b/patches/server/0102-Configurable-jockey-options.patch similarity index 99% rename from patches/server/0103-Configurable-jockey-options.patch rename to patches/server/0102-Configurable-jockey-options.patch index 7163093da..37b32ad21 100644 --- a/patches/server/0103-Configurable-jockey-options.patch +++ b/patches/server/0102-Configurable-jockey-options.patch @@ -1,4 +1,4 @@ -From f80fca99a5c328f68c3a90446cbdb5cda49bcdd7 Mon Sep 17 00:00:00 2001 +From e08b23e89c1207ccb55349347521cc0de0cc37cd Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 26 Mar 2020 21:39:32 -0500 Subject: [PATCH] Configurable jockey options diff --git a/patches/server/0104-Configurable-enchantment-max-level.patch b/patches/server/0103-Configurable-enchantment-max-level.patch similarity index 99% rename from patches/server/0104-Configurable-enchantment-max-level.patch rename to patches/server/0103-Configurable-enchantment-max-level.patch index 0911e97da..a34f2fcd4 100644 --- a/patches/server/0104-Configurable-enchantment-max-level.patch +++ b/patches/server/0103-Configurable-enchantment-max-level.patch @@ -1,4 +1,4 @@ -From f6ac58c03507514d78c1c53b240df7c3c518f2f0 Mon Sep 17 00:00:00 2001 +From df05bfbcf31d32354e0286477ecf261279eb244d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 1 Apr 2020 17:21:42 -0500 Subject: [PATCH] Configurable enchantment max level diff --git a/patches/server/0105-Optimize-Chunk-Ticks.patch b/patches/server/0104-Optimize-Chunk-Ticks.patch similarity index 99% rename from patches/server/0105-Optimize-Chunk-Ticks.patch rename to patches/server/0104-Optimize-Chunk-Ticks.patch index eb9810c16..33ea0524a 100644 --- a/patches/server/0105-Optimize-Chunk-Ticks.patch +++ b/patches/server/0104-Optimize-Chunk-Ticks.patch @@ -1,4 +1,4 @@ -From 8c5d1a7830e01bdec9b793ca78efb1bdbaa5c681 Mon Sep 17 00:00:00 2001 +From 9e7ef8eea9cb9c27ffc7b15b4ad7926629ca5667 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Apr 2020 00:28:06 -0500 Subject: [PATCH] Optimize Chunk Ticks diff --git a/patches/server/0106-Add-configurable-beehive-generation-chance.patch b/patches/server/0105-Add-configurable-beehive-generation-chance.patch similarity index 99% rename from patches/server/0106-Add-configurable-beehive-generation-chance.patch rename to patches/server/0105-Add-configurable-beehive-generation-chance.patch index 47ed9e7a2..86ca731e0 100644 --- a/patches/server/0106-Add-configurable-beehive-generation-chance.patch +++ b/patches/server/0105-Add-configurable-beehive-generation-chance.patch @@ -1,4 +1,4 @@ -From 3e3ed022c3baa918e0f2ede87d132473c55f75ac Mon Sep 17 00:00:00 2001 +From a4900735eb07249132c6a813145a613e4d86026b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Apr 2020 03:39:34 -0500 Subject: [PATCH] Add configurable beehive generation chance diff --git a/patches/server/0107-Add-more-timings-timers.patch b/patches/server/0106-Add-more-timings-timers.patch similarity index 99% rename from patches/server/0107-Add-more-timings-timers.patch rename to patches/server/0106-Add-more-timings-timers.patch index cd29644e5..31d92ff4e 100644 --- a/patches/server/0107-Add-more-timings-timers.patch +++ b/patches/server/0106-Add-more-timings-timers.patch @@ -1,4 +1,4 @@ -From aa1850cfb7ab695152dc0e698dce7b99a58b0ffc Mon Sep 17 00:00:00 2001 +From 758523eb133359d46e347782229675a02ee5a1e9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 Apr 2020 02:36:45 -0500 Subject: [PATCH] Add more timings timers diff --git a/patches/server/0108-Skip-events-if-there-s-no-listeners.patch b/patches/server/0107-Skip-events-if-there-s-no-listeners.patch similarity index 96% rename from patches/server/0108-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0107-Skip-events-if-there-s-no-listeners.patch index 3413dc759..8b8126322 100644 --- a/patches/server/0108-Skip-events-if-there-s-no-listeners.patch +++ b/patches/server/0107-Skip-events-if-there-s-no-listeners.patch @@ -1,4 +1,4 @@ -From 4a9c0d2f7405197ec0067ccc93100f9fb287418b Mon Sep 17 00:00:00 2001 +From 67afec34bd04c7397e1079296ef6da3659175aa8 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 Apr 2020 03:07:59 -0500 Subject: [PATCH] Skip events if there's no listeners diff --git a/patches/server/0109-Debug-stick-should-not-update-neighbors.patch b/patches/server/0108-Debug-stick-should-not-update-neighbors.patch similarity index 94% rename from patches/server/0109-Debug-stick-should-not-update-neighbors.patch rename to patches/server/0108-Debug-stick-should-not-update-neighbors.patch index 286a7bf00..1ba1aad03 100644 --- a/patches/server/0109-Debug-stick-should-not-update-neighbors.patch +++ b/patches/server/0108-Debug-stick-should-not-update-neighbors.patch @@ -1,4 +1,4 @@ -From 352888a06e6832cefdfc356aa02970b54fec2e35 Mon Sep 17 00:00:00 2001 +From fb61a83a73f9de95c06c77f7f788d4df811c82f4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 Apr 2020 17:16:30 -0500 Subject: [PATCH] Debug stick should not update neighbors diff --git a/patches/server/0110-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0109-Add-enderman-and-creeper-griefing-controls.patch similarity index 98% rename from patches/server/0110-Add-enderman-and-creeper-griefing-controls.patch rename to patches/server/0109-Add-enderman-and-creeper-griefing-controls.patch index 30c98600d..48d8d5a35 100644 --- a/patches/server/0110-Add-enderman-and-creeper-griefing-controls.patch +++ b/patches/server/0109-Add-enderman-and-creeper-griefing-controls.patch @@ -1,4 +1,4 @@ -From d53c537129e476e92384ddf3012206cf251bd5e9 Mon Sep 17 00:00:00 2001 +From 1f2cea0e76872e923b9351c848918889ec610af4 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 26 Apr 2020 16:28:38 -0500 Subject: [PATCH] Add enderman and creeper griefing controls diff --git a/patches/server/0111-Chickens-can-retaliate.patch b/patches/server/0110-Chickens-can-retaliate.patch similarity index 98% rename from patches/server/0111-Chickens-can-retaliate.patch rename to patches/server/0110-Chickens-can-retaliate.patch index 26902732b..5418d6382 100644 --- a/patches/server/0111-Chickens-can-retaliate.patch +++ b/patches/server/0110-Chickens-can-retaliate.patch @@ -1,4 +1,4 @@ -From c27089388ed1c2db321d25f60b88ec878bfd0a49 Mon Sep 17 00:00:00 2001 +From fe4b5892ead117ebd0db78ba6415bdb129f81cff Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 12 Apr 2020 13:19:34 -0500 Subject: [PATCH] Chickens can retaliate diff --git a/patches/server/0112-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch b/patches/server/0111-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch similarity index 97% rename from patches/server/0112-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch rename to patches/server/0111-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch index 7d9126049..2f529b2dc 100644 --- a/patches/server/0112-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch +++ b/patches/server/0111-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch @@ -1,4 +1,4 @@ -From 7e15be00f7f884c7b0c122b115dbd89e1939f610 Mon Sep 17 00:00:00 2001 +From 02641240d37f617ad72ad74f28ddc87d950e0e7a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 24 Apr 2020 09:33:11 -0500 Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule diff --git a/patches/server/0113-More-anvil-controls.patch b/patches/server/0112-More-anvil-controls.patch similarity index 99% rename from patches/server/0113-More-anvil-controls.patch rename to patches/server/0112-More-anvil-controls.patch index 84845a052..20a3cbcd1 100644 --- a/patches/server/0113-More-anvil-controls.patch +++ b/patches/server/0112-More-anvil-controls.patch @@ -1,4 +1,4 @@ -From 827c0d379a0b6597d22c5c106eb52807de377870 Mon Sep 17 00:00:00 2001 +From aff14f5361f3b98c2bf66fa61d766e1db14af17e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 19 Apr 2020 00:17:56 -0500 Subject: [PATCH] More anvil controls diff --git a/patches/server/0114-Villagers-farming-can-bypass-mob-griefing-gamerule.patch b/patches/server/0113-Villagers-farming-can-bypass-mob-griefing-gamerule.patch similarity index 97% rename from patches/server/0114-Villagers-farming-can-bypass-mob-griefing-gamerule.patch rename to patches/server/0113-Villagers-farming-can-bypass-mob-griefing-gamerule.patch index 0200ff304..b0647d59c 100644 --- a/patches/server/0114-Villagers-farming-can-bypass-mob-griefing-gamerule.patch +++ b/patches/server/0113-Villagers-farming-can-bypass-mob-griefing-gamerule.patch @@ -1,4 +1,4 @@ -From f09c0fbca0a916ee9cdccbbbff2fe1a2f79cba63 Mon Sep 17 00:00:00 2001 +From 4fec6b17576670bee04b5fe77d3aac03c348d251 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 24 Apr 2020 09:37:29 -0500 Subject: [PATCH] Villagers farming can bypass mob-griefing gamerule diff --git a/patches/server/0115-Player-invulnerabilities.patch b/patches/server/0114-Player-invulnerabilities.patch similarity index 98% rename from patches/server/0115-Player-invulnerabilities.patch rename to patches/server/0114-Player-invulnerabilities.patch index 8e06751ff..650f2e04d 100644 --- a/patches/server/0115-Player-invulnerabilities.patch +++ b/patches/server/0114-Player-invulnerabilities.patch @@ -1,4 +1,4 @@ -From 67b240f9c510dfb11392cb1c4a173aba12d5bf26 Mon Sep 17 00:00:00 2001 +From 6601b605fd122327b6cf4d6dbde13ff5ee278649 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 2 May 2020 20:55:44 -0500 Subject: [PATCH] Player invulnerabilities @@ -75,7 +75,7 @@ index 977392373..6572177c5 100644 public Scoreboard getScoreboard() { return getBukkitEntity().getScoreboard().getHandle(); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6f7fd0f64..030d19a79 100644 +index 00a30519d..2eeeed017 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1548,6 +1548,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/patches/server/0116-Do-not-strip-colors-from-death-messages.patch b/patches/server/0115-Do-not-strip-colors-from-death-messages.patch similarity index 94% rename from patches/server/0116-Do-not-strip-colors-from-death-messages.patch rename to patches/server/0115-Do-not-strip-colors-from-death-messages.patch index ca07b6f48..c4237b65f 100644 --- a/patches/server/0116-Do-not-strip-colors-from-death-messages.patch +++ b/patches/server/0115-Do-not-strip-colors-from-death-messages.patch @@ -1,4 +1,4 @@ -From 41f066356c5c3493af9db9d6892e179dc8f051e0 Mon Sep 17 00:00:00 2001 +From 962285cc430c028dd08bff3c3e61b8fbe363dba3 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 7 Jun 2020 13:16:02 -0500 Subject: [PATCH] Do not strip colors from death messages diff --git a/patches/server/0117-Add-PrepareGrindstoneEvent.patch b/patches/server/0116-Add-PrepareGrindstoneEvent.patch similarity index 96% rename from patches/server/0117-Add-PrepareGrindstoneEvent.patch rename to patches/server/0116-Add-PrepareGrindstoneEvent.patch index 6cfe5dec3..7f2de00b1 100644 --- a/patches/server/0117-Add-PrepareGrindstoneEvent.patch +++ b/patches/server/0116-Add-PrepareGrindstoneEvent.patch @@ -1,4 +1,4 @@ -From 910112766d93a8703e0a04f5d1d9920cfaa7cfd3 Mon Sep 17 00:00:00 2001 +From 6388840e7fdd890b026b827d3b54f7da27a6f511 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 18 Jun 2020 23:29:54 -0500 Subject: [PATCH] Add PrepareGrindstoneEvent diff --git a/patches/server/0118-Fix-reloading-paper.yml.patch b/patches/server/0117-Fix-reloading-paper.yml.patch similarity index 94% rename from patches/server/0118-Fix-reloading-paper.yml.patch rename to patches/server/0117-Fix-reloading-paper.yml.patch index e28daeb75..4df7c09de 100644 --- a/patches/server/0118-Fix-reloading-paper.yml.patch +++ b/patches/server/0117-Fix-reloading-paper.yml.patch @@ -1,4 +1,4 @@ -From ed743edc4805265b70ed281823a74984531e0b0f Mon Sep 17 00:00:00 2001 +From 01f779999483a518fbcc4bb50d1012721f5bd591 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 19 Jun 2020 21:36:16 -0500 Subject: [PATCH] Fix reloading paper.yml diff --git a/patches/server/0119-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch b/patches/server/0118-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch similarity index 96% rename from patches/server/0119-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch rename to patches/server/0118-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch index 3de5368ef..2c633079a 100644 --- a/patches/server/0119-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch +++ b/patches/server/0118-MC-125757-Fix-Always-increment-arrow-despawn-counter.patch @@ -1,4 +1,4 @@ -From 5c1ca79bd88c7166053cff3c3b2deb71193efc47 Mon Sep 17 00:00:00 2001 +From c54950636f4071df3ba78b647838a6c731dad604 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 21 Feb 2020 17:04:51 -0600 Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter diff --git a/patches/server/0120-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0119-MC-168772-Fix-Add-turtle-egg-block-options.patch similarity index 97% rename from patches/server/0120-MC-168772-Fix-Add-turtle-egg-block-options.patch rename to patches/server/0119-MC-168772-Fix-Add-turtle-egg-block-options.patch index 17f48faca..767cef495 100644 --- a/patches/server/0120-MC-168772-Fix-Add-turtle-egg-block-options.patch +++ b/patches/server/0119-MC-168772-Fix-Add-turtle-egg-block-options.patch @@ -1,4 +1,4 @@ -From 5b6860305459b4fe3e1a22b7d8e7271792d3df00 Mon Sep 17 00:00:00 2001 +From aa1c6cff1f8d0d3490aeccb736ebe442bfd4665d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 6 Jun 2019 22:15:46 -0500 Subject: [PATCH] MC-168772 Fix - Add turtle egg block options diff --git a/patches/server/0121-MC-4-Fix-Item-position-desync.patch b/patches/server/0120-MC-4-Fix-Item-position-desync.patch similarity index 98% rename from patches/server/0121-MC-4-Fix-Item-position-desync.patch rename to patches/server/0120-MC-4-Fix-Item-position-desync.patch index 3d40b7966..c11a1cfff 100644 --- a/patches/server/0121-MC-4-Fix-Item-position-desync.patch +++ b/patches/server/0120-MC-4-Fix-Item-position-desync.patch @@ -1,4 +1,4 @@ -From 732b58eb1fe4d8da9a4cea23ad014419e81662cb Mon Sep 17 00:00:00 2001 +From 3066c4fd1c0e1722328c02c45a91216cc9757377 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 6 Jul 2019 21:12:58 -0500 Subject: [PATCH] MC-4 Fix - Item position desync diff --git a/patches/server/0122-MC-56653-Fix-pig-zombies-aggro.patch b/patches/server/0121-MC-56653-Fix-pig-zombies-aggro.patch similarity index 98% rename from patches/server/0122-MC-56653-Fix-pig-zombies-aggro.patch rename to patches/server/0121-MC-56653-Fix-pig-zombies-aggro.patch index 792cca655..141f7b374 100644 --- a/patches/server/0122-MC-56653-Fix-pig-zombies-aggro.patch +++ b/patches/server/0121-MC-56653-Fix-pig-zombies-aggro.patch @@ -1,4 +1,4 @@ -From 8c57c949a583f85788a8a5bc481a938918a53d9d Mon Sep 17 00:00:00 2001 +From 92a5d8dbf53574306790877796c786ee0604fb5f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 9 Jul 2019 20:56:47 -0500 Subject: [PATCH] MC-56653 Fix - pig zombies aggro diff --git a/patches/server/0123-EMC-MonsterEggSpawn-Event.patch b/patches/server/0122-EMC-MonsterEggSpawn-Event.patch similarity index 98% rename from patches/server/0123-EMC-MonsterEggSpawn-Event.patch rename to patches/server/0122-EMC-MonsterEggSpawn-Event.patch index 601d62023..a055c7e24 100644 --- a/patches/server/0123-EMC-MonsterEggSpawn-Event.patch +++ b/patches/server/0122-EMC-MonsterEggSpawn-Event.patch @@ -1,4 +1,4 @@ -From d08ef8215637d0902eaca47e8638ad0b860b417d Mon Sep 17 00:00:00 2001 +From 8766ab3142d8c5ae273e6e160f16b5c2eb51f398 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 20 Jul 2013 22:40:56 -0400 Subject: [PATCH] EMC - MonsterEggSpawn Event diff --git a/patches/server/0124-PaperPR-Add-BellRingEvent.patch b/patches/server/0123-PaperPR-Add-BellRingEvent.patch similarity index 97% rename from patches/server/0124-PaperPR-Add-BellRingEvent.patch rename to patches/server/0123-PaperPR-Add-BellRingEvent.patch index 258c0728b..09d3c696a 100644 --- a/patches/server/0124-PaperPR-Add-BellRingEvent.patch +++ b/patches/server/0123-PaperPR-Add-BellRingEvent.patch @@ -1,4 +1,4 @@ -From 5ce023753262d5b0a62eb10d6cd6301c0a49f736 Mon Sep 17 00:00:00 2001 +From 645f0e70778082ed0c0355f0d703dc8d3a269af0 Mon Sep 17 00:00:00 2001 From: Eearslya Sleiarion Date: Mon, 24 Jun 2019 21:27:32 -0700 Subject: [PATCH] PaperPR - Add BellRingEvent diff --git a/patches/server/0125-PaperPR-PlayerItemCooldownEvent.patch b/patches/server/0124-PaperPR-PlayerItemCooldownEvent.patch similarity index 93% rename from patches/server/0125-PaperPR-PlayerItemCooldownEvent.patch rename to patches/server/0124-PaperPR-PlayerItemCooldownEvent.patch index 022894afb..9692230b7 100644 --- a/patches/server/0125-PaperPR-PlayerItemCooldownEvent.patch +++ b/patches/server/0124-PaperPR-PlayerItemCooldownEvent.patch @@ -1,4 +1,4 @@ -From 9ea86cbc0573b76be31b9f6b1f30659a1677fca2 Mon Sep 17 00:00:00 2001 +From ac3aea5c4687c6c17a2efc5fe044b876d24d74d7 Mon Sep 17 00:00:00 2001 From: KennyTV Date: Mon, 20 Apr 2020 13:57:06 +0200 Subject: [PATCH] PaperPR - PlayerItemCooldownEvent @@ -8,7 +8,7 @@ Subject: [PATCH] PaperPR - PlayerItemCooldownEvent 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java -index 27cde8c155..3c3bcc7f91 100644 +index 27cde8c15..3c3bcc7f9 100644 --- a/src/main/java/net/minecraft/server/ItemCooldownPlayer.java +++ b/src/main/java/net/minecraft/server/ItemCooldownPlayer.java @@ -2,12 +2,23 @@ package net.minecraft.server; diff --git a/patches/server/0126-YAPFA-Disable-mojang-profiler.patch b/patches/server/0125-YAPFA-Disable-mojang-profiler.patch similarity index 99% rename from patches/server/0126-YAPFA-Disable-mojang-profiler.patch rename to patches/server/0125-YAPFA-Disable-mojang-profiler.patch index b6abf5686..11c39c56d 100644 --- a/patches/server/0126-YAPFA-Disable-mojang-profiler.patch +++ b/patches/server/0125-YAPFA-Disable-mojang-profiler.patch @@ -1,4 +1,4 @@ -From b35e8a48830a90a06fcf803f62bdaba77a370382 Mon Sep 17 00:00:00 2001 +From b21435be03ef81ca9cdaabaf4ace1d2c37bf219e Mon Sep 17 00:00:00 2001 From: tr7zw Date: Thu, 5 Mar 2020 23:08:01 +0100 Subject: [PATCH] YAPFA - Disable mojang profiler