Repo-Mirror/EcoCrates
9
0
Fork 0
Code Issues Releases Activity

Fixed bug with /killall

Browse Source
This commit is contained in:
Auxilor
2022-03-17 17:45:10 +00:00
parent 98fc7113c7
commit 583263836e
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eco-core/core-plugin/src/main/kotlin/com/willfp/ecocrates/crate/Crate.kt
View File

@@ -44,7 +44,7 @@ class Crate(
val hologramHeight = config.getDouble("placed.hologram.height")
val showRandomReward = config.getBool("placed.random-reward.enabled")
val isShowingRandomReward = config.getBool("placed.random-reward.enabled")
val randomRewardHeight = config.getDouble("placed.random-reward.height")

32
eco-core/core-plugin/src/main/kotlin/com/willfp/ecocrates/crate/placed/PlacedCrate.kt
View File

@@ -28,19 +28,7 @@ class PlacedCrate(
crate.hologramLines
)
private val item: Item? = if (crate.showRandomReward) {
val entity = world.dropItem(
location.clone().add(0.0, crate.randomRewardHeight, 0.0),
crate.rewards.first().display
)
entity.velocity = Vector(0.0, 0.0, 0.0)
entity.pickupDelay = Int.MAX_VALUE
entity.setGravity(false)
entity.isCustomNameVisible = true
entity.customName = crate.randomRewardName
entity.owner = UUID(0, 0)
entity
} else null
private var item: Item? = null
internal fun tick(tick: Int) {
tickRandomReward(tick)
@@ -55,8 +43,26 @@ class PlacedCrate(
item?.remove()
}
private fun spawnRandomReward() {
if ((item == null || item?.isDead == true) && crate.isShowingRandomReward) {
val entity = world.dropItem(
location.clone().add(0.0, crate.randomRewardHeight, 0.0),
crate.rewards.first().display
)
entity.velocity = Vector(0.0, 0.0, 0.0)
entity.pickupDelay = Int.MAX_VALUE
entity.setGravity(false)
entity.isCustomNameVisible = true
entity.customName = crate.randomRewardName
entity.owner = UUID(0, 0)
println("sus? amogus?")
item = entity
}
}
private fun tickRandomReward(tick: Int) {
if (tick % crate.randomRewardDelay == 0) {
spawnRandomReward()
item?.itemStack = crate.rewards.random().display
item?.teleport(location.clone().add(0.0, crate.randomRewardHeight, 0.0))
}