From e5932647158149148552c5d60474246f395c8a54 Mon Sep 17 00:00:00 2001 From: Ben Kerllenevich Date: Thu, 2 Dec 2021 06:39:53 -0500 Subject: [PATCH] upstream --- build.gradle.kts | 4 ++-- gradle.properties | 2 +- patches/server/0006-Ridables.patch | 6 +++--- patches/server/0067-Implement-elytra-settings.patch | 6 +++--- .../0191-API-for-any-mob-to-burn-daylight.patch | 4 ++-- ...r-azalea-blocks-to-grow-into-trees-naturall.patch | 12 ++++++------ 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8f4763828..2530bb4b6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,8 +3,8 @@ import io.papermc.paperweight.util.constants.* plugins { java `maven-publish` - id("com.github.johnrengelman.shadow") version "7.1.0" - id("io.papermc.paperweight.patcher") version "1.3.0-SNAPSHOT" + id("com.github.johnrengelman.shadow") version "7.1.0" apply false + id("io.papermc.paperweight.patcher") version "1.3.1" } repositories { diff --git a/gradle.properties b/gradle.properties index 65d36b6d8..97beeb83b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.18-R0.1-SNAPSHOT mcVersion = 1.18 packageVersion = 1_18_R1 -paperCommit = bd9c2b75c75941ae9f54fae5c1dd6a8f5e0e8158 +paperCommit = 956124f86a93515cf67ee850e96cfd7bc58e27e8 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch index a37993d83..a9e51a580 100644 --- a/patches/server/0006-Ridables.patch +++ b/patches/server/0006-Ridables.patch @@ -201,7 +201,7 @@ index 645c1dc9bd09b135a641759c76ce8d957b9bd488..03adc3b746e05bb4b0514ba4a66c101b protected ParticleOptions getInkParticle() { return ParticleTypes.GLOW_SQUID_INK; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 62daf918d4ab00963041ca869ae718f14f2e3337..c455a43a87b07ba5f7787bb9f3bbd0caf8095151 100644 +index 93b616d1b95e9c112dcd4b6fda9bd467177e6dec..6953ff6f4f1b607f9294ca37022226fde260150b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -217,9 +217,9 @@ public abstract class LivingEntity extends Entity { @@ -226,7 +226,7 @@ index 62daf918d4ab00963041ca869ae718f14f2e3337..c455a43a87b07ba5f7787bb9f3bbd0ca double d0 = (double) this.getJumpPower() + this.getJumpBoostPower(); Vec3 vec3d = this.getDeltaMovement(); // Paper start -@@ -3237,8 +3237,10 @@ public abstract class LivingEntity extends Entity { +@@ -3307,8 +3307,10 @@ public abstract class LivingEntity extends Entity { this.pushEntities(); this.level.getProfiler().pop(); // Paper start @@ -239,7 +239,7 @@ index 62daf918d4ab00963041ca869ae718f14f2e3337..c455a43a87b07ba5f7787bb9f3bbd0ca Location from = new Location(this.level.getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO); Location to = new Location (this.level.getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot()); io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone()); -@@ -3248,6 +3250,21 @@ public abstract class LivingEntity extends Entity { +@@ -3318,6 +3320,21 @@ public abstract class LivingEntity extends Entity { absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch()); } } diff --git a/patches/server/0067-Implement-elytra-settings.patch b/patches/server/0067-Implement-elytra-settings.patch index ae4f92631..8dc85e728 100644 --- a/patches/server/0067-Implement-elytra-settings.patch +++ b/patches/server/0067-Implement-elytra-settings.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 2eea21644321fa07950b44cddfe72c4d8f329702..782c49ebd9574aa68de4693fec20c6130f656c23 100644 +index fd5459c77e615db4bc805c58489260270b09d608..b4c07823da0c18bd59bf44583d4e1f17c6d13820 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3297,7 +3297,16 @@ public abstract class LivingEntity extends Entity { +@@ -3367,7 +3367,16 @@ public abstract class LivingEntity extends Entity { int j = i / 10; if (j % 2 == 0) { @@ -99,7 +99,7 @@ index 998758be827efbcb7693ed36ab1dffc0ef0369bf..5beaafec0759543d3bddf99028c97d0d entityhuman.startAutoSpinAttack(20); if (entityhuman.isOnGround()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f2807fac5533e995975cf35e014b7fc361576d32..3163d930237291d4a80e5b36e15b4880e3933a4e 100644 +index 90a01edb79f9662fcf18c7c762772629fe09d06f..95b42ca5b54a45715f19e36492c9f86cf30ff8eb 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -99,6 +99,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0191-API-for-any-mob-to-burn-daylight.patch b/patches/server/0191-API-for-any-mob-to-burn-daylight.patch index c54407b06..3f7d3eaff 100644 --- a/patches/server/0191-API-for-any-mob-to-burn-daylight.patch +++ b/patches/server/0191-API-for-any-mob-to-burn-daylight.patch @@ -29,7 +29,7 @@ index 35a04f593c66ae898b8b891dd4082aefe4d3feef..a4b0f5e289cbcb8eef3ba7994ab29319 // Purpur end } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 59f4415ba484e49897a20b8e9fc576b7d8b4bfe8..1d9fa83b33921f64fe6e0917084e01b1a0dfa20e 100644 +index 2c5d453f57b28008e5b98cf6aec044cb3ffb2385..b4e33ccc2e62a0183867cbf11394ce637fae058d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -262,6 +262,7 @@ public abstract class LivingEntity extends Entity { @@ -60,7 +60,7 @@ index 59f4415ba484e49897a20b8e9fc576b7d8b4bfe8..1d9fa83b33921f64fe6e0917084e01b1 } // CraftBukkit start -@@ -3317,6 +3324,27 @@ public abstract class LivingEntity extends Entity { +@@ -3387,6 +3394,27 @@ public abstract class LivingEntity extends Entity { this.hurt(DamageSource.DROWN, 1.0F); } diff --git a/patches/server/0236-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0236-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch index 58cae4f03..b2caf2a72 100644 --- a/patches/server/0236-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch +++ b/patches/server/0236-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch @@ -5,13 +5,13 @@ Subject: [PATCH] Chance for azalea blocks to grow into trees naturally diff --git a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java -index 47b32d89766862b998824fd3dd97265899651c15..8c0646dda3032bce8a95c66c9e504b68a32af85f 100644 +index ade4d3c56b02b82cf71c6d1b030209c5ba172957..f6273abc36944e2265e6776c57169776e5ea3850 100644 --- a/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java +++ b/src/main/java/net/minecraft/world/level/block/AzaleaBlock.java -@@ -48,6 +48,20 @@ public class AzaleaBlock extends BushBlock implements BonemealableBlock { +@@ -42,6 +42,20 @@ public class AzaleaBlock extends BushBlock implements BonemealableBlock { @Override - public void performBonemeal(ServerLevel world, Random random, BlockPos pos, net.minecraft.world.level.block.state.BlockState state) { + public void performBonemeal(ServerLevel world, Random random, BlockPos pos, BlockState state) { + // Purpur start + growTree(world, random, pos, state); + } @@ -26,9 +26,9 @@ index 47b32d89766862b998824fd3dd97265899651c15..8c0646dda3032bce8a95c66c9e504b68 + + private void growTree(ServerLevel world, Random random, BlockPos pos, net.minecraft.world.level.block.state.BlockState state) { + // Purpur end - // CraftBukkit start - world.captureTreeGeneration = true; - // CraftBukkit end + TREE_GROWER.growTree(world, world.getChunkSource().getGenerator(), pos, state, random); + } + } diff --git a/src/main/java/net/minecraft/world/level/block/Blocks.java b/src/main/java/net/minecraft/world/level/block/Blocks.java index 71e494b949541284b0642dae4b20a6b3ec459828..625ad12e43cc651c986a3b45ce9a7c5be6b715ab 100644 --- a/src/main/java/net/minecraft/world/level/block/Blocks.java