Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-25 01:49:30 +00:00
Code Issues Releases Activity

Merge branch 'dev' of https://github.com/Xiao-MoMi/craft-engine into dev

Browse Source
This commit is contained in:
XiaoMoMi
2025-09-11 18:29:52 +08:00
parent c5c518ce14 ead74be21c
commit 9f7a597d6d
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bukkit/src/main/java/net/momirealms/craftengine/bukkit/block/behavior/BouncingBlockBehavior.java
View File

@@ -17,21 +17,21 @@ import java.util.concurrent.Callable;
public class BouncingBlockBehavior extends BukkitBlockBehavior implements TriggerOnceBlockBehavior {
public static final Factory FACTORY = new Factory();
private final double bounceHeight;
private final boolean fallDamage;
private final boolean syncPlayerPosition;
private final double fallDamageMultiplier;
public BouncingBlockBehavior(CustomBlock customBlock, double bounceHeight, boolean fallDamage) {
public BouncingBlockBehavior(CustomBlock customBlock, double bounceHeight, boolean syncPlayerPosition, double fallDamageMultiplier) {
super(customBlock);
this.bounceHeight = bounceHeight;
this.fallDamage = fallDamage;
this.syncPlayerPosition = syncPlayerPosition;
this.fallDamageMultiplier = fallDamageMultiplier;
}
@Override
public void fallOn(Object thisBlock, Object[] args, Callable<Object> superMethod) {
if (!this.fallDamage) {
return;
}
if (this.fallDamageMultiplier <= 0.0) return;
Object entity = args[3];
Object finalFallDistance = VersionHelper.isOrAbove1_21_5() ? (double) args[4] * 0.5 : (float) args[4] * 0.5F;
Object finalFallDistance = VersionHelper.isOrAbove1_21_5() ? (double) args[4] * this.fallDamageMultiplier : (float) args[4] * this.fallDamageMultiplier;
FastNMS.INSTANCE.method$Entity$causeFallDamage(
entity, finalFallDistance, 1.0F,
FastNMS.INSTANCE.method$DamageSources$fall(FastNMS.INSTANCE.method$Entity$damageSources(entity))
@@ -54,8 +54,9 @@ public class BouncingBlockBehavior extends BukkitBlockBehavior implements Trigge
double d = CoreReflections.clazz$LivingEntity.isInstance(entity) ? 1.0 : 0.8;
double y = -deltaMovement.y * this.bounceHeight * d;
FastNMS.INSTANCE.method$Entity$setDeltaMovement(entity, deltaMovement.x, y, deltaMovement.z);
if (CoreReflections.clazz$Player.isInstance(entity) && y > 0.032) {
// 防抖
if (CoreReflections.clazz$Player.isInstance(entity) && this.syncPlayerPosition
&& /* 防抖 -> */ y > 0.032 /* <- 防抖 */
) {
FastNMS.INSTANCE.field$Entity$hurtMarked(entity, true);
}
}
@@ -66,8 +67,9 @@ public class BouncingBlockBehavior extends BukkitBlockBehavior implements Trigge
@Override
public BlockBehavior create(CustomBlock block, Map<String, Object> arguments) {
double bounceHeight = ResourceConfigUtils.getAsDouble(arguments.getOrDefault("bounce-height", 0.66), "bounce-height");
boolean fallDamage = ResourceConfigUtils.getAsBoolean(arguments.getOrDefault("fall-damage", false), "fall-damage");
return new BouncingBlockBehavior(block, bounceHeight, fallDamage);
boolean syncPlayerPosition = ResourceConfigUtils.getAsBoolean(arguments.getOrDefault("sync-player-position", true), "sync-player-position");
double fallDamageMultiplier = ResourceConfigUtils.getAsDouble(arguments.getOrDefault("fall-damage-multiplier", 0.5), "fall-damage-multiplier");
return new BouncingBlockBehavior(block, bounceHeight, syncPlayerPosition, fallDamageMultiplier);
}
}
}

2
common-files/src/main/resources/resources/default/configuration/blocks.yml
View File

@@ -590,7 +590,7 @@ items#misc:
behavior:
type: bouncing_block
bounce-height: 0.66
sync-player-self: false
sync-player-position: false
state:
id: 0
state: white_bed[facing=west,occupied=false,part=foot]