Fix player_takes_damage and player_deals_damage: Use correct source
Fixes #2042, relates to #2121
This commit is contained in:
1 parent
e1503bae72
commit
469a9356f6
1 file changed
+2
-2
@@ -886,7 +886,7 @@ public class CarpetEventServer
|
|||||||
new NumericValue(amount),
|
new NumericValue(amount),
|
||||||
StringValue.of(source.getMsgId()),
|
StringValue.of(source.getMsgId()),
|
||||||
source.getEntity() == null ? Value.NULL : new EntityValue(source.getEntity())
|
source.getEntity() == null ? Value.NULL : new EntityValue(source.getEntity())
|
||||||
), () -> target.level().getServer().createCommandSourceStack());
|
), () -> ((ServerPlayer) target).createCommandSourceStack());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
public static final Event PLAYER_DEALS_DAMAGE = new Event("player_deals_damage", 3, false)
|
public static final Event PLAYER_DEALS_DAMAGE = new Event("player_deals_damage", 3, false)
|
||||||
@@ -896,7 +896,7 @@ public class CarpetEventServer
|
|||||||
{
|
{
|
||||||
return handler.call(() ->
|
return handler.call(() ->
|
||||||
Arrays.asList(new EntityValue(source.getEntity()), new NumericValue(amount), new EntityValue(target)),
|
Arrays.asList(new EntityValue(source.getEntity()), new NumericValue(amount), new EntityValue(target)),
|
||||||
() -> source.getEntity().level().getServer().createCommandSourceStack()
|
() -> ((ServerPlayer) source.getEntity()).createCommandSourceStack()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in new issue
Block a user