From a383515c95e84c30b3dae52b39efb70f4ecca974 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 23 Dec 2019 03:59:27 +0000 Subject: [PATCH] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 8073dbec SPIGOT-5474: Just ignore bugged fireball data --- ...ftMagicNumbers.isSupportedApiVersion.patch | 2 +- .../Fix-spawn-radius-being-treated-as-0.patch | 2 +- ...5656-Fix-Follow-Range-Initial-Target.patch | 10 ++++------ Spigot-Server-Patches/MC-Dev-fixes.patch | 13 ------------ Spigot-Server-Patches/Optimize-Hoppers.patch | 2 +- .../PlayerLaunchProjectileEvent.patch | 16 +++++++-------- ...Prevent-TRAP-while-loading-Fireballs.patch | 20 ------------------- work/CraftBukkit | 2 +- 8 files changed, 16 insertions(+), 51 deletions(-) delete mode 100644 Spigot-Server-Patches/Prevent-TRAP-while-loading-Fireballs.patch diff --git a/Spigot-Server-Patches/Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/Add-CraftMagicNumbers.isSupportedApiVersion.patch index 895218c5ec..94011af693 100644 --- a/Spigot-Server-Patches/Add-CraftMagicNumbers.isSupportedApiVersion.patch +++ b/Spigot-Server-Patches/Add-CraftMagicNumbers.isSupportedApiVersion.patch @@ -5,7 +5,7 @@ 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 @@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/Spigot-Server-Patches/Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/Fix-spawn-radius-being-treated-as-0.patch index 67e453853e..72a3fb0a83 100644 --- a/Spigot-Server-Patches/Fix-spawn-radius-being-treated-as-0.patch +++ b/Spigot-Server-Patches/Fix-spawn-radius-being-treated-as-0.patch @@ -5,7 +5,7 @@ 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 @@ -0,0 +0,0 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/MC-145656-Fix-Follow-Range-Initial-Target.patch index a6bac5839a..37f1da1dc0 100644 --- a/Spigot-Server-Patches/MC-145656-Fix-Follow-Range-Initial-Target.patch +++ b/Spigot-Server-Patches/MC-145656-Fix-Follow-Range-Initial-Target.patch @@ -5,7 +5,7 @@ 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 @@ -0,0 +0,0 @@ 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 @@ -0,0 +0,0 @@ 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 @@ -0,0 +0,0 @@ public class PathfinderTargetCondition { @@ -62,6 +62,4 @@ index c76a4383..e35ec2db 100644 + } + // Paper end } --- -2.24.0.rc1 - +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/MC-Dev-fixes.patch b/Spigot-Server-Patches/MC-Dev-fixes.patch index e5a3828ab9..1d6bc4d4f7 100644 --- a/Spigot-Server-Patches/MC-Dev-fixes.patch +++ b/Spigot-Server-Patches/MC-Dev-fixes.patch @@ -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 -@@ -0,0 +0,0 @@ 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/Optimize-Hoppers.patch b/Spigot-Server-Patches/Optimize-Hoppers.patch index f4b7b6f965..5bd344fdf5 100644 --- a/Spigot-Server-Patches/Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/Optimize-Hoppers.patch @@ -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 @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { @@ -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 @@ -0,0 +0,0 @@ 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 @@ -0,0 +0,0 @@ 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 @@ -0,0 +0,0 @@ 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 @@ -0,0 +0,0 @@ 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 @@ -0,0 +0,0 @@ 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 @@ -0,0 +0,0 @@ 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 @@ -0,0 +0,0 @@ public class ItemSplashPotion extends ItemPotionThrowable { diff --git a/Spigot-Server-Patches/Prevent-TRAP-while-loading-Fireballs.patch b/Spigot-Server-Patches/Prevent-TRAP-while-loading-Fireballs.patch deleted file mode 100644 index 106c18a8fc..0000000000 --- a/Spigot-Server-Patches/Prevent-TRAP-while-loading-Fireballs.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 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 -@@ -0,0 +0,0 @@ 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 - })); - } - --- \ No newline at end of file diff --git a/work/CraftBukkit b/work/CraftBukkit index 817116de01..8073dbec7a 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 817116de01089fb23c0334579cd18b9f5e079c4f +Subproject commit 8073dbec7a749ccb8e6c19a3595d3691888a2587