star/KSpigot
1
0
Fork 0
Code Pull Requests Packages Activity

Fixed StackOverflowError

Browse Source
This commit is contained in:
bluefireoly
2020-10-17 15:35:51 +02:00
parent 2a3582eeca
commit 9f6fcd5be8
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/net/axay/kspigot/kotlinextensions/GeneralExtensions.kt
View File

@@ -16,7 +16,7 @@ internal class MinMaxPair<T : Comparable<T>>(a: T, b: T) {
} }
} }
internal fun <T> T.apply(block: (T.() -> Unit)?): T { internal fun <T> T.applyIfNotNull(block: (T.() -> Unit)?): T {
if (block != null) if (block != null)
apply(block) apply(block)
return this return this

6
src/main/kotlin/net/axay/kspigot/particles/KSpigotParticles.kt
View File

@@ -1,7 +1,7 @@
package net.axay.kspigot.particles package net.axay.kspigot.particles
import net.axay.kspigot.extensions.bukkit.worldOrException import net.axay.kspigot.extensions.bukkit.worldOrException
import net.axay.kspigot.kotlinextensions.apply import net.axay.kspigot.kotlinextensions.applyIfNotNull
import org.bukkit.Location import org.bukkit.Location
import org.bukkit.Particle import org.bukkit.Particle
import org.bukkit.entity.Player import org.bukkit.entity.Player
@@ -74,7 +74,7 @@ fun particle(particle: Particle, builder: KSpigotParticle.() -> Unit)
* @see KSpigotParticle * @see KSpigotParticle
*/ */
fun Location.particle(particle: Particle, builder: (KSpigotParticle.() -> Unit)? = null) fun Location.particle(particle: Particle, builder: (KSpigotParticle.() -> Unit)? = null)
= KSpigotParticle(particle).apply(builder).spawnAt(this) = KSpigotParticle(particle).applyIfNotNull(builder).spawnAt(this)
/** /**
* Accesses the particle builder and then immediately * Accesses the particle builder and then immediately
@@ -82,4 +82,4 @@ fun Location.particle(particle: Particle, builder: (KSpigotParticle.() -> Unit)?
* @see KSpigotParticle * @see KSpigotParticle
*/ */
fun Player.particle(particle: Particle, builder: (KSpigotParticle.() -> Unit)? = null) fun Player.particle(particle: Particle, builder: (KSpigotParticle.() -> Unit)? = null)
= KSpigotParticle(particle).apply(builder).spawnFor(this) = KSpigotParticle(particle).applyIfNotNull(builder).spawnFor(this)

6
src/main/kotlin/net/axay/kspigot/sound/KSpigotSound.kt
View File

@@ -1,7 +1,7 @@
package net.axay.kspigot.sound package net.axay.kspigot.sound
import net.axay.kspigot.extensions.bukkit.worldOrException import net.axay.kspigot.extensions.bukkit.worldOrException
import net.axay.kspigot.kotlinextensions.apply import net.axay.kspigot.kotlinextensions.applyIfNotNull
import org.bukkit.Location import org.bukkit.Location
import org.bukkit.Sound import org.bukkit.Sound
import org.bukkit.SoundCategory import org.bukkit.SoundCategory
@@ -53,7 +53,7 @@ fun sound(sound: Sound, builder: KSpigotSound.() -> Unit)
* @see KSpigotSound * @see KSpigotSound
*/ */
fun Location.sound(sound: Sound, builder: (KSpigotSound.() -> Unit)? = null) fun Location.sound(sound: Sound, builder: (KSpigotSound.() -> Unit)? = null)
= KSpigotSound(sound).apply(builder).playAt(this) = KSpigotSound(sound).applyIfNotNull(builder).playAt(this)
/** /**
* Accesses the sound builder and then immediately * Accesses the sound builder and then immediately
@@ -61,4 +61,4 @@ fun Location.sound(sound: Sound, builder: (KSpigotSound.() -> Unit)? = null)
* @see KSpigotSound * @see KSpigotSound
*/ */
fun Player.sound(sound: Sound, builder: (KSpigotSound.() -> Unit)? = null) fun Player.sound(sound: Sound, builder: (KSpigotSound.() -> Unit)? = null)
= KSpigotSound(sound).apply(builder).playFor(this) = KSpigotSound(sound).applyIfNotNull(builder).playFor(this)