mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
d5c9306a7f
* init 1.21.4, and boom! * build change, but weight not work * just work * Build changes, and delete timings * Fix API patches (#406) * Fix API patches * merge --------- Co-authored-by: violetc <58360096+s-yh-china@users.noreply.github.com> * 0006/0129 * 0009/0129 * 0011/0129 * 0018/0129 * 0030/0129 * 0035/0129 * 0043/0129 * 0048/0129 * 0049/0129 * 0057/0129 * 0065/0129 * 0086/0129 (#408) * 0072/0129 * 0080/0129 * Readd patch infos * 0086/0129 * Delete applied patches * 0087/0129 * 0091/0129 * 0097/0129 * 0101/0129 * 102/129 * 0107/0129 * 0112/0129 * 0118/0129 * 0129/0129, 100% patched * fix some * server work * Protocol... (#409) * Jade v7 * Fix changed part for Jade * Formatting imports, add Lms Paster protocol * REI payloads 5/8 * Add REI support, remove unnecessary content in Jade * Rename * Make jade better * Make action work * fix action jar * Fix some protocol * Fix bot action, and entity tickCount * Fix Warden GameEventListener register on load * Fix extra Raider drop * Fix grindstone overstacking * Update Paper, and some doc * Merge * [ci skip] Update Action --------- Co-authored-by: Lumine1909 <133463833+Lumine1909@users.noreply.github.com>
86 lines
4.4 KiB
Diff
86 lines
4.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Sun, 30 Jul 2023 12:20:16 +0800
|
|
Subject: [PATCH] Zero tick plants
|
|
|
|
|
|
diff --git a/net/minecraft/world/level/block/BambooStalkBlock.java b/net/minecraft/world/level/block/BambooStalkBlock.java
|
|
index d824bb7d86fd9063ec8185f6bc74dc7450c2b73a..7598b403ed10559d271d302a7759f99e41d96dd5 100644
|
|
--- a/net/minecraft/world/level/block/BambooStalkBlock.java
|
|
+++ b/net/minecraft/world/level/block/BambooStalkBlock.java
|
|
@@ -119,6 +119,10 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
|
|
protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
|
|
if (!state.canSurvive(level, pos)) {
|
|
level.destroyBlock(pos, true);
|
|
+ // Leaves start - zero tick plants
|
|
+ } else if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.zeroTickPlants) {
|
|
+ this.randomTick(state, level, pos, random);
|
|
+ // Leaves end - zero tick plants
|
|
}
|
|
}
|
|
|
|
diff --git a/net/minecraft/world/level/block/CactusBlock.java b/net/minecraft/world/level/block/CactusBlock.java
|
|
index 913779c68b178dbbfac3b1dcee0c6342028e5570..590525a5de0119b8a9652a00ec99b10d6cae2c46 100644
|
|
--- a/net/minecraft/world/level/block/CactusBlock.java
|
|
+++ b/net/minecraft/world/level/block/CactusBlock.java
|
|
@@ -43,6 +43,10 @@ public class CactusBlock extends Block {
|
|
protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
|
|
if (!state.canSurvive(level, pos)) {
|
|
level.destroyBlock(pos, true);
|
|
+ // Leaves start - zero tick plants
|
|
+ } else if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.zeroTickPlants) {
|
|
+ this.randomTick(state, level, pos, random);
|
|
+ // Leaves end - zero tick plants
|
|
}
|
|
}
|
|
|
|
diff --git a/net/minecraft/world/level/block/ChorusFlowerBlock.java b/net/minecraft/world/level/block/ChorusFlowerBlock.java
|
|
index 3af8f150474a8a461c5829850172196b7b9e7bfd..04e392cabf3b5c171d86cb47b29b34d05222d4a4 100644
|
|
--- a/net/minecraft/world/level/block/ChorusFlowerBlock.java
|
|
+++ b/net/minecraft/world/level/block/ChorusFlowerBlock.java
|
|
@@ -49,6 +49,9 @@ public class ChorusFlowerBlock extends Block {
|
|
protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
|
|
if (!state.canSurvive(level, pos)) {
|
|
level.destroyBlock(pos, true);
|
|
+ } else if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.zeroTickPlants) {
|
|
+ this.randomTick(state, level, pos, random);
|
|
+ // Leaves end - zero tick plants
|
|
}
|
|
}
|
|
|
|
diff --git a/net/minecraft/world/level/block/GrowingPlantHeadBlock.java b/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
|
|
index 0994f7265322d1f33365a1df0faaffd9df05fcc0..90577291e4a2846a89c59bd5297a99e910378276 100644
|
|
--- a/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
|
|
+++ b/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
|
|
@@ -148,4 +148,15 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
|
|
protected GrowingPlantHeadBlock getHeadBlock() {
|
|
return this;
|
|
}
|
|
+
|
|
+ // Leaves start - zero tick plants
|
|
+ @Override
|
|
+ public void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource random) {
|
|
+ if (!state.canSurvive(world, pos)) {
|
|
+ world.destroyBlock(pos, true);
|
|
+ } else if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.zeroTickPlants) {
|
|
+ this.randomTick(state, world, pos, random);
|
|
+ }
|
|
+ }
|
|
+ // Leaves end - zero tick plants
|
|
}
|
|
diff --git a/net/minecraft/world/level/block/SugarCaneBlock.java b/net/minecraft/world/level/block/SugarCaneBlock.java
|
|
index 63d53f9090caca304c7f8c3f9910c57a6bdbb4d5..1d1e699926c2e244937b34d9f54c627bbd2ce5b4 100644
|
|
--- a/net/minecraft/world/level/block/SugarCaneBlock.java
|
|
+++ b/net/minecraft/world/level/block/SugarCaneBlock.java
|
|
@@ -44,6 +44,10 @@ public class SugarCaneBlock extends Block {
|
|
protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
|
|
if (!state.canSurvive(level, pos)) {
|
|
level.destroyBlock(pos, true);
|
|
+ // Leaves start - zero tick plants
|
|
+ } else if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.zeroTickPlants) {
|
|
+ this.randomTick(state, level, pos, random);
|
|
+ // Leaves end - zero tick plants
|
|
}
|
|
}
|
|
|