diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch index 737fd4c39..288e009f6 100644 --- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch +++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch @@ -1,4 +1,4 @@ -From 99ee1ad8a97e5391d783116aa7806180212f601f Mon Sep 17 00:00:00 2001 +From 989cb57bde61072538221078488e241958fdbdbc Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 19:36:20 -0400 Subject: [PATCH] MC Dev fixes @@ -156,19 +156,6 @@ index f2c0e06ba..909d13c42 100644 } private EntityEnderDragon o() { -diff --git a/src/main/java/net/minecraft/server/EntityFireballFireball.java b/src/main/java/net/minecraft/server/EntityFireballFireball.java -index 8e28c4725..3988e68d4 100644 ---- a/src/main/java/net/minecraft/server/EntityFireballFireball.java -+++ b/src/main/java/net/minecraft/server/EntityFireballFireball.java -@@ -18,7 +18,7 @@ public abstract class EntityFireballFireball extends EntityFireball { - - public void b(ItemStack itemstack) { - if (itemstack.getItem() != Items.FIRE_CHARGE || itemstack.hasTag()) { -- this.getDataWatcher().set(EntityFireballFireball.f, SystemUtils.a((Object) itemstack.cloneItemStack(), (itemstack1) -> { -+ this.getDataWatcher().set(EntityFireballFireball.f, SystemUtils.a(itemstack.cloneItemStack(), (itemstack1) -> { // Paper - decompile fix - itemstack1.setCount(1); - })); - } diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java index 7d44348c7..73ecdd22e 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java diff --git a/Spigot-Server-Patches/0415-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0414-PlayerLaunchProjectileEvent.patch similarity index 97% rename from Spigot-Server-Patches/0415-PlayerLaunchProjectileEvent.patch rename to Spigot-Server-Patches/0414-PlayerLaunchProjectileEvent.patch index 92c422166..d94babe67 100644 --- a/Spigot-Server-Patches/0415-PlayerLaunchProjectileEvent.patch +++ b/Spigot-Server-Patches/0414-PlayerLaunchProjectileEvent.patch @@ -1,11 +1,11 @@ -From cdff9796b6b2cd859ab372d827f555411a66dcd5 Mon Sep 17 00:00:00 2001 +From e38167e75d1e96f7a54df8cc01b01d2cbb6f2f44 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:11:03 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent diff --git a/src/main/java/net/minecraft/server/InteractionResultWrapper.java b/src/main/java/net/minecraft/server/InteractionResultWrapper.java -index a6b96456bc..712bda1225 100644 +index a6b96456b..712bda122 100644 --- a/src/main/java/net/minecraft/server/InteractionResultWrapper.java +++ b/src/main/java/net/minecraft/server/InteractionResultWrapper.java @@ -10,6 +10,7 @@ public class InteractionResultWrapper { @@ -17,7 +17,7 @@ index a6b96456bc..712bda1225 100644 return this.a; } diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java -index 89d399c9ff..15a536dab8 100644 +index 89d399c9f..15a536dab 100644 --- a/src/main/java/net/minecraft/server/ItemEgg.java +++ b/src/main/java/net/minecraft/server/ItemEgg.java @@ -16,13 +16,32 @@ public class ItemEgg extends Item { @@ -55,7 +55,7 @@ index 89d399c9ff..15a536dab8 100644 return InteractionResultWrapper.a(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java -index 315e012740..34ad0c1190 100644 +index 315e01274..34ad0c119 100644 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java @@ -16,22 +16,37 @@ public class ItemEnderPearl extends Item { @@ -107,7 +107,7 @@ index 315e012740..34ad0c1190 100644 return InteractionResultWrapper.a(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java -index f83eb5c45e..1bcf582922 100644 +index f83eb5c45..1bcf58292 100644 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java @@ -15,19 +15,38 @@ public class ItemExpBottle extends Item { @@ -152,7 +152,7 @@ index f83eb5c45e..1bcf582922 100644 return InteractionResultWrapper.a(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java -index c19b678cfb..7672e31fc0 100644 +index c19b678cf..7672e31fc 100644 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java @@ -8,7 +8,11 @@ public class ItemLingeringPotion extends ItemPotionThrowable { @@ -170,7 +170,7 @@ index c19b678cfb..7672e31fc0 100644 } } diff --git a/src/main/java/net/minecraft/server/ItemPotionThrowable.java b/src/main/java/net/minecraft/server/ItemPotionThrowable.java -index 8f8f31b265..72dcf109f6 100644 +index 8f8f31b26..72dcf109f 100644 --- a/src/main/java/net/minecraft/server/ItemPotionThrowable.java +++ b/src/main/java/net/minecraft/server/ItemPotionThrowable.java @@ -15,13 +15,31 @@ public class ItemPotionThrowable extends ItemPotion { @@ -207,7 +207,7 @@ index 8f8f31b265..72dcf109f6 100644 return InteractionResultWrapper.a(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java -index abbf2b7881..4ad2856961 100644 +index abbf2b788..4ad285696 100644 --- a/src/main/java/net/minecraft/server/ItemSnowball.java +++ b/src/main/java/net/minecraft/server/ItemSnowball.java @@ -17,18 +17,27 @@ public class ItemSnowball extends Item { @@ -244,7 +244,7 @@ index abbf2b7881..4ad2856961 100644 /* if (!entityhuman.abilities.canInstantlyBuild) { diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java -index 18bd846cee..e71e933fff 100644 +index 18bd846ce..e71e933ff 100644 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java @@ -8,7 +8,11 @@ public class ItemSplashPotion extends ItemPotionThrowable { diff --git a/Spigot-Server-Patches/0414-Prevent-TRAP-while-loading-Fireballs.patch b/Spigot-Server-Patches/0414-Prevent-TRAP-while-loading-Fireballs.patch deleted file mode 100644 index c77040115..000000000 --- a/Spigot-Server-Patches/0414-Prevent-TRAP-while-loading-Fireballs.patch +++ /dev/null @@ -1,22 +0,0 @@ -From e6d8c07d576607a1caa436219801345fd4667c24 Mon Sep 17 00:00:00 2001 -From: Shane Freeder -Date: Sat, 14 Dec 2019 01:10:45 +0000 -Subject: [PATCH] Prevent TRAP while loading Fireballs - - -diff --git a/src/main/java/net/minecraft/server/EntityFireballFireball.java b/src/main/java/net/minecraft/server/EntityFireballFireball.java -index 3988e68d4f..a16b756a05 100644 ---- a/src/main/java/net/minecraft/server/EntityFireballFireball.java -+++ b/src/main/java/net/minecraft/server/EntityFireballFireball.java -@@ -19,7 +19,7 @@ public abstract class EntityFireballFireball extends EntityFireball { - public void b(ItemStack itemstack) { - if (itemstack.getItem() != Items.FIRE_CHARGE || itemstack.hasTag()) { - this.getDataWatcher().set(EntityFireballFireball.f, SystemUtils.a(itemstack.cloneItemStack(), (itemstack1) -> { // Paper - decompile fix -- itemstack1.setCount(1); -+ if(!itemstack1.isEmpty()) itemstack1.setCount(1); // Paper - })); - } - --- -2.24.1 - diff --git a/Spigot-Server-Patches/0416-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch similarity index 89% rename from Spigot-Server-Patches/0416-Add-CraftMagicNumbers.isSupportedApiVersion.patch rename to Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch index 9f94d5654..7f6a352df 100644 --- a/Spigot-Server-Patches/0416-Add-CraftMagicNumbers.isSupportedApiVersion.patch +++ b/Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch @@ -1,11 +1,11 @@ -From 15747ba9932f93e9f01492d4f111a4f6b2d358cd Mon Sep 17 00:00:00 2001 +From 009a60a50466d5a0e18d54a5410a9a222e392d0b Mon Sep 17 00:00:00 2001 From: BlackHole Date: Sun, 15 Dec 2019 19:12:39 +0100 Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion() diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 21bfdf9e71..ab5c6e92ea 100644 +index 40f7b433a..ab3ebc79e 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -298,6 +298,11 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/0416-Fix-spawn-radius-being-treated-as-0.patch similarity index 91% rename from Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch rename to Spigot-Server-Patches/0416-Fix-spawn-radius-being-treated-as-0.patch index 85d2d21b3..00dc1463a 100644 --- a/Spigot-Server-Patches/0417-Fix-spawn-radius-being-treated-as-0.patch +++ b/Spigot-Server-Patches/0416-Fix-spawn-radius-being-treated-as-0.patch @@ -1,11 +1,11 @@ -From 7484a5c8f953f1927d7bec853111a6df5f422207 Mon Sep 17 00:00:00 2001 +From 12a0c60fd1aa113b525117c6d92c8ab12f5fb58c Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 15 Dec 2019 19:41:28 +0000 Subject: [PATCH] Fix spawn radius being treated as 0 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index f130c5ddc4..ed6f1b1a3e 100644 +index f130c5ddc..ed6f1b1a3 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -123,7 +123,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0418-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0417-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 94% rename from Spigot-Server-Patches/0418-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to Spigot-Server-Patches/0417-MC-145656-Fix-Follow-Range-Initial-Target.patch index 8e4dabaac..7be745485 100644 --- a/Spigot-Server-Patches/0418-MC-145656-Fix-Follow-Range-Initial-Target.patch +++ b/Spigot-Server-Patches/0417-MC-145656-Fix-Follow-Range-Initial-Target.patch @@ -1,11 +1,11 @@ -From 39b74954af241d322ef875ca66e807ec7636008e Mon Sep 17 00:00:00 2001 +From f70de6c68dbc7c37171890858ad3049ddb26285b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 18 Dec 2019 22:21:35 -0600 Subject: [PATCH] MC-145656 Fix Follow Range Initial Target diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index dbc645eb..95be6cb2 100644 +index dbc645ebb..95be6cb2b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -631,4 +631,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index dbc645eb..95be6cb2 100644 + } } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java -index 5a2fa079..b81b9a9a 100644 +index 5a2fa079e..b81b9a9a4 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java @@ -25,6 +25,7 @@ public class PathfinderGoalNearestAttackableTarget exten @@ -31,7 +31,7 @@ index 5a2fa079..b81b9a9a 100644 @Override diff --git a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java -index c76a4383..e35ec2db 100644 +index c76a43837..e35ec2db0 100644 --- a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java +++ b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java @@ -80,7 +80,7 @@ public class PathfinderTargetCondition { @@ -63,5 +63,5 @@ index c76a4383..e35ec2db 100644 + // Paper end } -- -2.24.0.rc1 +2.24.1 diff --git a/Spigot-Server-Patches/0419-Optimize-Hoppers.patch b/Spigot-Server-Patches/0418-Optimize-Hoppers.patch similarity index 99% rename from Spigot-Server-Patches/0419-Optimize-Hoppers.patch rename to Spigot-Server-Patches/0418-Optimize-Hoppers.patch index 408ad1d3e..78f1ff958 100644 --- a/Spigot-Server-Patches/0419-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0418-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From c640bc9fc99c40e316e3a1725c2d4bf24adddeb8 Mon Sep 17 00:00:00 2001 +From 55c73aaf1ae91331a1fc6bbad18fc26506fe6f6e Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Optimize Hoppers @@ -49,7 +49,7 @@ index 1be4cd163..182633bca 100644 itemstack.d(this.C()); if (this.tag != null) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 664c48d68..edb3a6035 100644 +index fe24d924e..0365cebcf 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1219,6 +1219,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant