PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-23 13:37:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Palm trees are recognised as trees by the buck ability now

Browse source
This commit is contained in:
Sollace 2023-05-25 13:10:18 +01:00
parent 86c569127a
commit 1e043af154
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java
View file

@ -156,10 +156,10 @@ public class EarthPonyKickAbility implements Ability<Pos> {
if (tree == TreeType.NONE) {
return;
} else {
ParticleUtils.spawnParticle(iplayer.asWorld(), UParticles.GROUND_POUND, data.vec(), Vec3d.ZERO);
}
ParticleUtils.spawnParticle(iplayer.asWorld(), UParticles.GROUND_POUND, data.vec(), Vec3d.ZERO);
PlayerEntity player = iplayer.asEntity();
if (BlockDestructionManager.of(player.world).getBlockDestruction(pos) + 4 >= BlockDestructionManager.MAX_DAMAGE) {
@ -245,6 +245,10 @@ public class EarthPonyKickAbility implements Ability<Pos> {
return Stream.of(tree.pickRandomStack(world.random, treeState));
}
if (below.getBlock() instanceof Buckable buckable) {
return buckable.onBucked((ServerWorld)world, below, down).stream();
}
return Stream.empty();
}

4
src/main/java/com/minelittlepony/unicopia/ability/data/tree/TreeType.java
View file

@ -120,7 +120,9 @@ public interface TreeType {
traverseInner(logs, leaves, w, findCanopy(w, pos), 0, 50, null, null);
return logCount <= (leaves.size() / 2) ? logCount + leaves.size() : 0;
int leafCount = leaves.size();
return logCount <= (leafCount / 2) ? logCount + leafCount : 0;
}
/**

6
src/main/resources/data/unicopia/tree_types/palm.json Normal file
View file

@ -0,0 +1,6 @@
{
"logs": [ "unicopia:palm_log", "unicopia:palm_wood" ],
"leaves": [ "unicopia:palm_leaves" ],
"wideTrunk": false,
"drops": []
}