Cobwebs and sweet berry bushes slow the player

Entity.applyEffectsFromBlocks now runs WebBlock.entityInside and
SweetBerryBushBlock.entityInside for the player through
Player.makeStuckInBlock (no slowdown while flying, impulse context reset),
with Weaving's lighter cobweb hold and the sweet_berry_bush damage of a
grown bush while the known movement is at least 0.003 on X or Z. The scene
motion harness gains cobweb and berry-bush fixtures run through vanilla's
real applyEffectsFromBlocks.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Ludovic Marie
2026-10-14 17:10:00 +02:00
parent 2b9674af8f
commit 39e8bbb2f4
6 changed files with 133 additions and 12 deletions
@@ -442,6 +442,12 @@ fn main() -> Result<()> {
world.player.freeze_immune = boots;
}
"frozen" => world.player.ticks_frozen = op["value"].as_i64().unwrap() as i32,
"weaving" => world.player.status.weaving = op["value"].as_bool().unwrap(),
"flying" => {
let flying = op["value"].as_bool().unwrap();
world.player.may_fly = flying;
world.player.flying = flying;
}
"trigger" => world.player.jump_trigger_time = op["value"].as_i64().unwrap() as i32,
"delay" => world.player.no_jump_delay = op["value"].as_i64().unwrap() as i32,
"move" => world.move_self(vector(&op["value"]))?,
+3
View File
@@ -283,6 +283,7 @@ impl PlayerEffects {
levitation: self.amplifier("levitation"),
resistance: self.amplifier("resistance"),
fire_resistance: self.get("fire_resistance").is_some(),
weaving: self.get("weaving").is_some(),
water_breathing: self.get("water_breathing").is_some()
|| self.get("conduit_power").is_some(),
protection: Vec::new(),
@@ -378,6 +379,8 @@ pub struct StatusFlags {
pub levitation: Option<i32>,
pub resistance: Option<i32>,
pub fire_resistance: bool,
/// Weaving: cobwebs hold half as much (`WebBlock.entityInside`).
pub weaving: bool,
pub water_breathing: bool,
/// Armor enchantment protection per damage type id (`EnchantmentHelper.getDamageProtection`).
pub protection: Vec<(String, f32)>,
+5
View File
@@ -81,6 +81,8 @@ pub enum HealthEvent {
StarvationDamage(f32),
/// `LivingEntity.aiStep` hurting a fully frozen entity.
FreezeDamage(f32),
/// `SweetBerryBushBlock.entityInside` pricking a moving entity.
SweetBerryBushDamage(f32),
Updated {
id: u8,
value: f32,
@@ -106,6 +108,9 @@ impl HealthEvent {
match self {
Self::StarvationDamage(amount) => format!("damage starve {:08x}", amount.to_bits()),
Self::FreezeDamage(amount) => format!("damage freeze {:08x}", amount.to_bits()),
Self::SweetBerryBushDamage(amount) => {
format!("damage sweet_berry_bush {:08x}", amount.to_bits())
}
Self::Updated { id, value, dirty } => {
format!("updated {id} {:08x} {dirty}", value.to_bits())
}
+64 -7
View File
@@ -775,7 +775,7 @@ impl MotionWorld<'_, '_, '_> {
}
/// `Entity.applyEffectsFromBlocks` for the blocks Horizon's player reacts
/// to inside its movement path: powder snow (`PowderSnowBlock.entityInside`
/// and the FREEZE / EXTINGUISH effects). Pressure plates, tripwires and
/// and the FREEZE / EXTINGUISH effects), cobwebs and sweet berry bushes. Pressure plates, tripwires and
/// rails are the world tick's scan.
pub fn apply_effects_from_blocks(&mut self) -> Result<()> {
use horizon_world::entity_move::MovementRecord;
@@ -955,9 +955,14 @@ impl MotionWorld<'_, '_, '_> {
}
};
if inside && visited.insert(p.pack()) {
if powder_snow {
self.powder_snow_inside(p)?;
entered.push((step, p));
match name {
"minecraft:powder_snow" => {
self.powder_snow_inside(p)?;
entered.push((step, p));
}
"minecraft:cobweb" => self.web_inside(),
"minecraft:sweet_berry_bush" => self.sweet_berry_bush_inside(state)?,
_ => {}
}
// ServerPlayer.onInsideBlock
self.player.events.push(MotionEvent::EnterBlock { state });
@@ -965,6 +970,60 @@ impl MotionWorld<'_, '_, '_> {
}
Ok(iterations + 1)
}
/// `Player.makeStuckInBlock`: the next move is scaled by `multiplier`
/// (and the fall forgotten) unless flying; the impulse context resets
/// either way.
fn make_stuck_in_block(&mut self, multiplier: Vec3) {
if !self.player.flying {
self.player.fall_distance = 0.0;
self.player.stuck_multiplier = multiplier;
}
self.player.impulse.try_reset();
}
/// `WebBlock.entityInside`: stuck at a quarter of the speed, half with
/// the Weaving effect.
fn web_inside(&mut self) {
let multiplier = if self.player.status.weaving {
Vec3::new(0.5, 0.25, 0.5)
} else {
Vec3::new(0.25, f64::from(0.05_f32), 0.25)
};
self.make_stuck_in_block(multiplier);
}
/// `SweetBerryBushBlock.entityInside` for the player: slowed, and pricked
/// (`sweetBerryBush` damage, 1) by a grown bush while its known movement
/// is at least 0.003 on X or Z.
fn sweet_berry_bush_inside(&mut self, state: BlockStateId) -> Result<()> {
self.make_stuck_in_block(Vec3::new(f64::from(0.8_f32), 0.75, f64::from(0.8_f32)));
let age = self
.assets
.registry
.state(state)
.and_then(|s| s.properties.get("age"))
.map_or("0", |a| a.as_str());
if age == "0" {
return Ok(());
}
// Player.isClientAuthoritative: ServerPlayer.getKnownMovement, this
// tick's movement.
let known = self.player.position.subtract(self.player.old_position);
if known.x * known.x + known.z * known.z > 0.0
&& (known.x.abs() >= f64::from(0.003_f32) || known.z.abs() >= f64::from(0.003_f32))
{
let id = self
.resources
.health
.damage
.id("minecraft:sweet_berry_bush")
.ok_or("missing sweet_berry_bush damage type")?;
self.player.events.push(MotionEvent::Health(
crate::health::HealthEvent::SweetBerryBushDamage(1.0),
));
let rules = self.scene.health_rules;
self.player.hurt(&self.resources.health, rules, id, 1.0)?;
}
Ok(())
}
/// `PowderSnowBlock.entityInside` for the player: stuck while the block
/// at its feet is powder snow, with a snowflake now and then (server).
fn powder_snow_inside(&mut self, p: BlockPos) -> Result<()> {
@@ -977,9 +1036,7 @@ impl MotionWorld<'_, '_, '_> {
if !in_block {
return Ok(());
}
// Entity.makeStuckInBlock
EntityMoveWorld::reset_fall_distance(self)?;
self.player.stuck_multiplier = Vec3::new(f64::from(0.9_f32), 1.5, f64::from(0.9_f32));
self.make_stuck_in_block(Vec3::new(f64::from(0.9_f32), 1.5, f64::from(0.9_f32)));
// ServerPlayer.getKnownMovement: this tick's movement.
let known = self.player.position.subtract(self.player.old_position);
let random = &mut self.scene.random;
@@ -74,8 +74,9 @@ public final class VanillaSceneMotionOracle {
return VanillaBlockLandingOracle.sound(s);
}
static final class Sources extends DamageSources {
DamageSource fall,stalagmite,starve,freeze;Sources(){super(null);}
DamageSource fall,stalagmite,starve,freeze,sweetBerryBush;Sources(){super(null);}
@Override public DamageSource freeze(){return freeze;}
@Override public DamageSource sweetBerryBush(){return sweetBerryBush;}
@Override public DamageSource starve(){return starve;}
@Override public DamageSource fall(){return fall;}
@Override public DamageSource stalagmite(){return stalagmite;}
@@ -188,7 +189,9 @@ public final class VanillaSceneMotionOracle {
@Override public boolean isAutoSpinAttack(){return false;}
@Override public boolean isSpectator(){return false;}
@Override public boolean isNoGravity(){return false;}
@Override public boolean hasEffect(Holder<MobEffect> effect){return false;}
// No effects but Weaving (WebBlock.entityInside), set without the effect's callbacks.
boolean weaving;
@Override public boolean hasEffect(Holder<MobEffect> effect){return weaving&&effect==net.minecraft.world.effect.MobEffects.WEAVING;}
@Override public MobEffectInstance getEffect(Holder<MobEffect> effect){return null;}
@Override public MoveSimulationType getMoveSimulationType(){return MoveSimulationType.SERVER_AND_CLIENT;}
@Override public boolean isClientAuthoritative(){return false;}
@@ -205,7 +208,7 @@ public final class VanillaSceneMotionOracle {
String name=stat==net.minecraft.stats.Stats.DAMAGE_ABSORBED?"absorbed":stat==net.minecraft.stats.Stats.DAMAGE_TAKEN?"taken":stat==net.minecraft.stats.Stats.DAMAGE_RESISTED?"resisted":null;
if(name==null){name=stat.getPath();if(!Set.of("swim_one_cm","walk_under_water_one_cm","walk_on_water_one_cm","climb_one_cm","sprint_one_cm","crouch_one_cm","walk_one_cm","aviate_one_cm","fly_one_cm").contains(name))throw new AssertionError(stat);}events.add("health-stat "+name+" "+value);
}
@Override public boolean hurtServer(net.minecraft.server.level.ServerLevel level,DamageSource source,float damage){var sources=((Level)level).sources;events.add(String.format("damage %s %08x",source==sources.fall?"fall":source==sources.stalagmite?"stalagmite":source==sources.starve?"starve":source==sources.freeze?"freeze":"unknown",Float.floatToIntBits(damage)));return super.hurtServer(level,source,damage);}
@Override public boolean hurtServer(net.minecraft.server.level.ServerLevel level,DamageSource source,float damage){var sources=((Level)level).sources;events.add(String.format("damage %s %08x",source==sources.fall?"fall":source==sources.stalagmite?"stalagmite":source==sources.starve?"starve":source==sources.freeze?"freeze":source==sources.sweetBerryBush?"sweet_berry_bush":"unknown",Float.floatToIntBits(damage)));return super.hurtServer(level,source,damage);}
@Override public void teleportRelative(double x,double y,double z){setPos(getX()+x,getY()+y,getZ()+z);}
@Override protected void playStepSound(BlockPos p,BlockState state){}
@Override public void gameEvent(Holder<GameEvent> event,Entity source){}
@@ -283,7 +286,7 @@ public final class VanillaSceneMotionOracle {
var trace=new Trace();trace.out=new PrintWriter(OutputStream.nullOutputStream());trace.fail=-1;
var level=(Level)allocate.invoke(unsafe,Level.class);level.chunks=VanillaSceneCollisionOracle.scene(description,trace);level.border=new Border();
level.rng=net.minecraft.util.RandomSource.create(0);level.sources=(Sources)allocate.invoke(unsafe,Sources.class);
level.sources.fall=damageSources.get("minecraft:fall");level.sources.stalagmite=damageSources.get("minecraft:stalagmite");level.sources.starve=damageSources.get("minecraft:starve");level.sources.freeze=damageSources.get("minecraft:freeze");
level.sources.fall=damageSources.get("minecraft:fall");level.sources.stalagmite=damageSources.get("minecraft:stalagmite");level.sources.starve=damageSources.get("minecraft:starve");level.sources.freeze=damageSources.get("minecraft:freeze");level.sources.sweetBerryBush=damageSources.get("minecraft:sweet_berry_bush");
level.waypoints=(Waypoints)allocate.invoke(unsafe,Waypoints.class);level.waypoints.level=level;
level.rules=new Rules();level.difficulty=net.minecraft.world.Difficulty.NORMAL;
var server=(VanillaBlockLandingOracle.Server)allocate.invoke(unsafe,VanillaBlockLandingOracle.Server.class);
@@ -370,6 +373,8 @@ public final class VanillaSceneMotionOracle {
((EntityEquipment)field(LivingEntity.class,"equipment").get(p)).set(net.minecraft.world.entity.EquipmentSlot.FEET,stack);
}
case "frozen"->p.frozen=op.get("value").getAsInt();
case "weaving"->p.weaving=op.get("value").getAsBoolean();
case "flying"->{var a=p.getAbilities();a.mayfly=a.flying=op.get("value").getAsBoolean();}
case "trigger"->trigger.setInt(p,op.get("value").getAsInt());
case "delay"->delay.setInt(p,op.get("value").getAsInt());
case "ack_attributes"->{p.attrs.getAttributesToUpdate().clear();p.attrs.getAttributesToSync().clear();}
File diff suppressed because one or more lines are too long