Skip to content

Fixed server crash upon tree destruction #1192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexSolari wants to merge 1 commit into
base: develop/26.1.2
Choose a base branch
from
+6 −3
Open

Fixed server crash upon tree destruction #1192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion common/src/main/java/com/dtteam/dynamictrees/client/TintSourceHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.dtteam.dynamictrees.tree.species.Species;
import net.minecraft.client.Minecraft;
import net.minecraft.client.color.block.BlockTintSource;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.renderer.block.BlockAndTintGetter;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.block.state.BlockState;
Expand All @@ -16,7 +17,7 @@ public static int getFoliageColor(LeavesProperties leavesProperties, BlockAndTin
return tintSource.colorInWorld(blockState, level, pos);
}

public static int getLeavesColor(Species species, BlockAndTintGetter level, BlockPos pos) {
public static int getLeavesColor(Species species, ClientLevel level, BlockPos pos) {
LeavesProperties properties = species.getLeavesProperties();
BlockState state = properties.getDynamicLeavesState();
return getFoliageColor(properties, level, state, pos);
Expand Down
6 changes: 4 additions & 2 deletions common/src/main/java/com/dtteam/dynamictrees/entity/animation/FalloverAnimationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.BlockAndTintGetter;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.particles.BlockParticleOption;
Expand Down Expand Up @@ -111,6 +111,7 @@ private Vec3 rotateAroundAxis(Vec3 in, Vec3 axis, double theta){
}

protected void spawnLeavesParticlesWhileFalling(FallingTreeEntity entity, float fallSpeed){
if (!entity.level().isClientSide()) return;
BranchDestructionData data = entity.getDestroyData();
if (data.getAllLeavesWithPos().isEmpty()) return;

Expand All @@ -131,6 +132,7 @@ protected void spawnLeavesParticlesWhileFalling(FallingTreeEntity entity, float
}

protected void flingLeavesParticles(FallingTreeEntity entity, float fallSpeed){
if (!entity.level().isClientSide()) return;
int bounces = getData(entity).bounces;
if (bounces > 1) return;
int maxParticleBlocks = DTConfigs.COMMON.maxFallingTreeLeavesParticles.get();
Expand Down Expand Up @@ -170,7 +172,7 @@ protected void flingLeavesParticles(FallingTreeEntity entity, float fallSpeed){
}

private ParticleOptions getParticle(FallingTreeEntity entity, BlockState leavesState, BlockPos leavesPos){
BlockAndTintGetter level = Minecraft.getInstance().level;
ClientLevel level = Minecraft.getInstance().level;
if (level != null) {
if (leavesState.getBlock() instanceof DynamicLeavesBlock leavesBlock){
LeavesProperties properties = leavesBlock.getLeavesProperties();
Expand Down