Skip to content

Commit 394911a

Browse files
committed
Refactor get/setCurrentInterval to operator fun
1 parent c1cce9b commit 394911a

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

bukkit/version/remapped/src/main/kotlin/io/github/rothes/esu/bukkit/module/networkthrottle/EntityUpdateInterval.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ abstract class EntityUpdateInterval: CommonFeature<EntityUpdateInterval.FeatureC
3838
@Command("esu networkThrottle entityUpdateInterval entityType <entityType>")
3939
@ShortPerm
4040
fun getUpdateInterval(sender: User, entityType: EntityType<*>) {
41-
val interval = getCurrentInterval(entityType)
41+
val interval = this@EntityUpdateInterval[entityType]
4242
sender.miniMessage("<pc>Current update interval of entity type <pdc>${entityType.toShortString()}</pdc> is <pdc>$interval")
4343
}
4444
})
4545
}
4646

47-
abstract fun getCurrentInterval(entityType: EntityType<*>): Int
48-
abstract fun setCurrentInterval(entityType: EntityType<*>, interval: Int)
47+
abstract operator fun get(entityType: EntityType<*>): Int
48+
abstract operator fun set(entityType: EntityType<*>, interval: Int)
4949

5050
protected fun applyUpdateInterval() {
5151
val config = config
5252
for ((type, interval) in config.entityTypeUpdateInterval) {
53-
setCurrentInterval(type, interval)
53+
this[type] = interval
5454
}
5555
}
5656

@@ -60,8 +60,8 @@ abstract class EntityUpdateInterval: CommonFeature<EntityUpdateInterval.FeatureC
6060
Higher means less entity movement packets (more de-sync), but less network as deal.
6161
""")
6262
val entityTypeUpdateInterval: Map<EntityType<*>, Int> = mapOf(
63-
EntityType.PIG to INSTANCE.getCurrentInterval(EntityType.PIG),
64-
EntityType.ZOMBIE to INSTANCE.getCurrentInterval(EntityType.ZOMBIE),
63+
EntityType.PIG to INSTANCE[EntityType.PIG],
64+
EntityType.ZOMBIE to INSTANCE[EntityType.ZOMBIE],
6565
)
6666
): BaseFeatureConfiguration()
6767

bukkit/version/v1_17_1/src/main/kotlin/io/github/rothes/esu/bukkit/module/networkthrottle/v17_1/EntityUpdateIntervalImpl.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ object EntityUpdateIntervalImpl: EntityUpdateInterval() {
1212

1313
private val ENTITY_TYPE_UPDATE_INTERVAL = EntityType::class.java.getDeclaredField("updateInterval").usIntAccessor
1414

15-
override fun getCurrentInterval(entityType: EntityType<*>): Int {
15+
override operator fun get(entityType: EntityType<*>): Int {
1616
return ENTITY_TYPE_UPDATE_INTERVAL[entityType]
1717
}
1818

19-
override fun setCurrentInterval(entityType: EntityType<*>, interval: Int) {
19+
override operator fun set(entityType: EntityType<*>, interval: Int) {
2020
ENTITY_TYPE_UPDATE_INTERVAL[entityType] = interval
2121
}
2222

@@ -28,7 +28,7 @@ object EntityUpdateIntervalImpl: EntityUpdateInterval() {
2828
override fun handleEntity(entity: Entity): Boolean {
2929
val tracker = entity.tracker ?: return false
3030
val se = TRACKED_ENTITY_SERVER_ENTITY[tracker] as ServerEntity
31-
SERVER_ENTITY_UPDATE_INTERVAL[se] = getCurrentInterval(entity.type)
31+
SERVER_ENTITY_UPDATE_INTERVAL[se] = this@EntityUpdateIntervalImpl[entity.type]
3232
return true
3333
}
3434

bukkit/version/v1_21/src/main/kotlin/io/github/rothes/esu/bukkit/module/networkthrottle/v21__paper/ApplyCommandImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ object ApplyCommandImpl : EntityUpdateInterval.ApplyCommand() {
1212
override fun handleEntity(entity: Entity): Boolean {
1313
val tracker = entity.`moonrise$getTrackedEntity`() ?: return false
1414
val se = tracker.serverEntity
15-
SERVER_ENTITY_UPDATE_INTERVAL[se] = EntityUpdateInterval.INSTANCE.getCurrentInterval(entity.type)
15+
SERVER_ENTITY_UPDATE_INTERVAL[se] = EntityUpdateInterval.INSTANCE[entity.type]
1616
return true
1717
}
1818

0 commit comments

Comments
 (0)