Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-27 19:09:08 +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-10-20 03:29:53 +08:00
parent 11d1089840 5515a46666
commit 602e1ea4ab
9 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/net/momirealms/craftengine/core/entity/player/Player.java
View File

@@ -173,7 +173,7 @@ public abstract class Player extends AbstractEntity implements NetWorkUser {
public abstract void teleport(WorldPosition worldPosition);
public abstract void damage(double amount, Key damageType);
public abstract void damage(double amount, Key damageType, @Nullable Object causeEntity);
public abstract Locale locale();

2
core/src/main/java/net/momirealms/craftengine/core/plugin/context/function/DamageFunction.java
View File

@@ -26,7 +26,7 @@ public class DamageFunction<CTX extends Context> extends AbstractConditionalFunc
@Override
protected void runInternal(CTX ctx) {
selector.get(ctx).forEach(p -> p.damage(amount.getDouble(ctx), damageType));
selector.get(ctx).forEach(p -> p.damage(amount.getDouble(ctx), damageType, null));
}
@Override