Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Expressions that are just numbers will be immediately converted rather than being evaluated

Browse Source
This commit is contained in:
Auxilor
2023-06-18 21:11:14 +02:00
parent c85b8c08c7
commit 245b577adc
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/math/DelegatedExpressionHandler.kt
View File

@@ -15,6 +15,8 @@ class DelegatedExpressionHandler(
.build()
override fun evaluate(expression: String, context: PlaceholderContext): Double? {
expression.fastToDoubleOrNull()?.let { return it }
// Peak performance (totally not having fun with bitwise operators)
val hash = (((expression.hashCode() shl 5) - expression.hashCode()) xor
(context.player?.uniqueId?.hashCode() ?: 0)

11
eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/math/ExpressionHandlers.kt
View File

@@ -26,8 +26,10 @@ interface ExpressionHandler {
fun evaluate(expression: String, context: PlaceholderContext): Double?
}
private fun String.fastToDoubleOrNull(): Double? {
if (isEmpty()) {
fun String.fastToDoubleOrNull(): Double? {
val len = length
if (len == 0) {
return null
}
@@ -39,8 +41,7 @@ private fun String.fastToDoubleOrNull(): Double? {
var decimalPart = 0.0
var decimalIdx = -1
while (idx < length) {
while (idx < len) {
when (val char = this[idx]) {
'.' -> {
if (decimalIdx != -1) return null
@@ -62,7 +63,7 @@ private fun String.fastToDoubleOrNull(): Double? {
idx++
}
decimalPart /= 10.0.pow((length - decimalIdx - 1).toDouble())
decimalPart /= 10.0.pow((len - decimalIdx - 1).toDouble())
return if (isNegative) -(integerPart + decimalPart) else integerPart + decimalPart
}