From c215ce185861af0fd123a91a79ad8907d9a7951a Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Mon, 25 Dec 2023 16:47:06 -0800 Subject: [PATCH] [ci skip] cleanup patch diff from last commit --- ...PI-for-Reason-Source-Triggering-play.patch | 4 ++-- .../0566-Set-area-affect-cloud-rotation.patch | 4 ++-- ...eData-on-more-entities-when-spawning.patch | 6 +++--- ...otfix-spawning-item-xp-in-wrong-spot.patch | 19 ------------------- ...-read-and-store-sus-effect-duration.patch} | 0 ...e-correct-max-stack-size-in-crafter.patch} | 0 ...atch => 1049-Fix-scoreboard-entries.patch} | 0 ...tch => 1050-add-more-scoreboard-API.patch} | 0 ...stry.patch => 1051-Improve-Registry.patch} | 0 9 files changed, 7 insertions(+), 26 deletions(-) delete mode 100644 patches/server/1047-hotfix-spawning-item-xp-in-wrong-spot.patch rename patches/server/{1048-properly-read-and-store-sus-effect-duration.patch => 1047-properly-read-and-store-sus-effect-duration.patch} (100%) rename patches/server/{1049-Use-correct-max-stack-size-in-crafter.patch => 1048-Use-correct-max-stack-size-in-crafter.patch} (100%) rename patches/server/{1050-Fix-scoreboard-entries.patch => 1049-Fix-scoreboard-entries.patch} (100%) rename patches/server/{1051-add-more-scoreboard-API.patch => 1050-add-more-scoreboard-API.patch} (100%) rename patches/server/{1052-Improve-Registry.patch => 1051-Improve-Registry.patch} (100%) diff --git a/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 4d403c9440..9b2363590c 100644 --- a/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/patches/server/0126-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -324,7 +324,7 @@ index e72ed2ed8664cbc408cbe1e38f1f0acacc3841dd..2f628f36c32752d1bac910e180b90639 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java -index c5547988e8e4ec5f1d090d264e14556f490d4e31..5dde575e1341d05ecd52f4bb810cd1cce7c487a5 100644 +index c5547988e8e4ec5f1d090d264e14556f490d4e31..c3a55347b630c57aa36f9c761e1937dc95027bb7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java @@ -363,7 +363,7 @@ public final class CraftEntityTypes { @@ -332,7 +332,7 @@ index c5547988e8e4ec5f1d090d264e14556f490d4e31..5dde575e1341d05ecd52f4bb810cd1cc })); register(new EntityTypeData<>(EntityType.EXPERIENCE_ORB, ExperienceOrb.class, CraftExperienceOrb::new, - spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), 0) -+ spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.z(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null) // Paper ++ spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null) // Paper )); register(new EntityTypeData<>(EntityType.AREA_EFFECT_CLOUD, AreaEffectCloud.class, CraftAreaEffectCloud::new, spawnData -> new net.minecraft.world.entity.AreaEffectCloud(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z()))); register(new EntityTypeData<>(EntityType.EGG, Egg.class, CraftEgg::new, spawnData -> new ThrownEgg(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z()))); diff --git a/patches/server/0566-Set-area-affect-cloud-rotation.patch b/patches/server/0566-Set-area-affect-cloud-rotation.patch index e7e876d3fb..1904854b96 100644 --- a/patches/server/0566-Set-area-affect-cloud-rotation.patch +++ b/patches/server/0566-Set-area-affect-cloud-rotation.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Set area affect cloud rotation diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java -index 4e7c37c384116ddb9525994428e1bfac35b4a85e..f06e308adb90e2cfb1fdd8d905547fc4cb159c5c 100644 +index c3a55347b630c57aa36f9c761e1937dc95027bb7..0aa6cd6da72c4a48d8bb48adeccc2bb49939fabd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java @@ -365,7 +365,7 @@ public final class CraftEntityTypes { register(new EntityTypeData<>(EntityType.EXPERIENCE_ORB, ExperienceOrb.class, CraftExperienceOrb::new, - spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.z(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null) // Paper + spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null) // Paper )); - register(new EntityTypeData<>(EntityType.AREA_EFFECT_CLOUD, AreaEffectCloud.class, CraftAreaEffectCloud::new, spawnData -> new net.minecraft.world.entity.AreaEffectCloud(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z()))); + register(new EntityTypeData<>(EntityType.AREA_EFFECT_CLOUD, AreaEffectCloud.class, CraftAreaEffectCloud::new, createAndMove(net.minecraft.world.entity.EntityType.AREA_EFFECT_CLOUD))); // Paper - set area effect cloud rotation diff --git a/patches/server/0969-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0969-Respect-randomizeData-on-more-entities-when-spawning.patch index 885a1bea67..0b50ce9b7b 100644 --- a/patches/server/0969-Respect-randomizeData-on-more-entities-when-spawning.patch +++ b/patches/server/0969-Respect-randomizeData-on-more-entities-when-spawning.patch @@ -9,7 +9,7 @@ Subject: [PATCH] Respect randomizeData on more entities when spawning * ExperienceOrb diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java -index 8504509346c4ac113e4bde0253476dc2e779f880..628c40972a644d182b7a1c0c3611b00c120311e0 100644 +index 2c60f2d82daacfcfc1eb9f64267ca8ae70726d17..21d3b6f2021b2afd88c5ef6b9a375977d1ccadef 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java @@ -217,6 +217,13 @@ public final class CraftEntityTypes { @@ -35,8 +35,8 @@ index 8504509346c4ac113e4bde0253476dc2e779f880..628c40972a644d182b7a1c0c3611b00c return item; })); register(new EntityTypeData<>(EntityType.EXPERIENCE_ORB, ExperienceOrb.class, CraftExperienceOrb::new, -- spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.z(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null) // Paper -+ combine(combine(spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.z(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null), CLEAR_MOVE_IF_NOT_RANDOMIZED), (spawnData, experienceOrb) -> { if (!spawnData.randomizeData()) { experienceOrb.setYRot(0); } }) // Paper - respect randomizeData +- spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null) // Paper ++ combine(combine(spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null), CLEAR_MOVE_IF_NOT_RANDOMIZED), (spawnData, experienceOrb) -> { if (!spawnData.randomizeData()) { experienceOrb.setYRot(0); } }) // Paper - respect randomizeData )); register(new EntityTypeData<>(EntityType.AREA_EFFECT_CLOUD, AreaEffectCloud.class, CraftAreaEffectCloud::new, createAndMove(net.minecraft.world.entity.EntityType.AREA_EFFECT_CLOUD))); // Paper - set area effect cloud rotation register(new EntityTypeData<>(EntityType.EGG, Egg.class, CraftEgg::new, spawnData -> new ThrownEgg(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z()))); diff --git a/patches/server/1047-hotfix-spawning-item-xp-in-wrong-spot.patch b/patches/server/1047-hotfix-spawning-item-xp-in-wrong-spot.patch deleted file mode 100644 index 01223d1aa0..0000000000 --- a/patches/server/1047-hotfix-spawning-item-xp-in-wrong-spot.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic -Date: Sun, 17 Dec 2023 20:23:29 -0800 -Subject: [PATCH] hotfix spawning item/xp in wrong spot - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java -index 628c40972a644d182b7a1c0c3611b00c120311e0..21d3b6f2021b2afd88c5ef6b9a375977d1ccadef 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntityTypes.java -@@ -377,7 +377,7 @@ public final class CraftEntityTypes { - return item; - })); - register(new EntityTypeData<>(EntityType.EXPERIENCE_ORB, ExperienceOrb.class, CraftExperienceOrb::new, -- combine(combine(spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.z(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null), CLEAR_MOVE_IF_NOT_RANDOMIZED), (spawnData, experienceOrb) -> { if (!spawnData.randomizeData()) { experienceOrb.setYRot(0); } }) // Paper - respect randomizeData -+ combine(combine(spawnData -> new net.minecraft.world.entity.ExperienceOrb(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z(), 0, org.bukkit.entity.ExperienceOrb.SpawnReason.CUSTOM, null, null), CLEAR_MOVE_IF_NOT_RANDOMIZED), (spawnData, experienceOrb) -> { if (!spawnData.randomizeData()) { experienceOrb.setYRot(0); } }) // Paper - respect randomizeData - )); - register(new EntityTypeData<>(EntityType.AREA_EFFECT_CLOUD, AreaEffectCloud.class, CraftAreaEffectCloud::new, createAndMove(net.minecraft.world.entity.EntityType.AREA_EFFECT_CLOUD))); // Paper - set area effect cloud rotation - register(new EntityTypeData<>(EntityType.EGG, Egg.class, CraftEgg::new, spawnData -> new ThrownEgg(spawnData.minecraftWorld(), spawnData.x(), spawnData.y(), spawnData.z()))); diff --git a/patches/server/1048-properly-read-and-store-sus-effect-duration.patch b/patches/server/1047-properly-read-and-store-sus-effect-duration.patch similarity index 100% rename from patches/server/1048-properly-read-and-store-sus-effect-duration.patch rename to patches/server/1047-properly-read-and-store-sus-effect-duration.patch diff --git a/patches/server/1049-Use-correct-max-stack-size-in-crafter.patch b/patches/server/1048-Use-correct-max-stack-size-in-crafter.patch similarity index 100% rename from patches/server/1049-Use-correct-max-stack-size-in-crafter.patch rename to patches/server/1048-Use-correct-max-stack-size-in-crafter.patch diff --git a/patches/server/1050-Fix-scoreboard-entries.patch b/patches/server/1049-Fix-scoreboard-entries.patch similarity index 100% rename from patches/server/1050-Fix-scoreboard-entries.patch rename to patches/server/1049-Fix-scoreboard-entries.patch diff --git a/patches/server/1051-add-more-scoreboard-API.patch b/patches/server/1050-add-more-scoreboard-API.patch similarity index 100% rename from patches/server/1051-add-more-scoreboard-API.patch rename to patches/server/1050-add-more-scoreboard-API.patch diff --git a/patches/server/1052-Improve-Registry.patch b/patches/server/1051-Improve-Registry.patch similarity index 100% rename from patches/server/1052-Improve-Registry.patch rename to patches/server/1051-Improve-Registry.patch