Improve last commit

This commit is contained in:
2025-06-20 10:53:11 -07:00
parent fbfa0865fc
commit c2b774b6b1
5 changed files with 25 additions and 9 deletions

View File

@@ -8,6 +8,7 @@ class GalaxyCreations : JavaPlugin() {
internal val miniMessage = MiniMessage.miniMessage() internal val miniMessage = MiniMessage.miniMessage()
override fun onEnable() { override fun onEnable() {
server.pluginManager.registerEvents(EntityMoveListener(), this)
server.pluginManager.registerEvents(PlayerInteractListener(), this) server.pluginManager.registerEvents(PlayerInteractListener(), this)
server.pluginManager.registerEvents(PlayerJoinListener(this), this) server.pluginManager.registerEvents(PlayerJoinListener(this), this)
server.pluginManager.registerEvents(ProjectileLaunchListener(), this) server.pluginManager.registerEvents(ProjectileLaunchListener(), this)

View File

@@ -0,0 +1,15 @@
package xyz.lncvrt.galaxycreations.events
import io.papermc.paper.event.entity.EntityMoveEvent
import org.bukkit.entity.Player
import org.bukkit.event.EventHandler
import org.bukkit.event.Listener
class EntityMoveListener : Listener {
@EventHandler
fun onEntityMoveEvent(event: EntityMoveEvent) {
val chunk = event.entity.location.chunk
val entities = chunk.entities.filter { it !is Player }
if (entities.size > 9) entities.forEach { it.remove() }
}
}

View File

@@ -1,6 +1,6 @@
package xyz.lncvrt.galaxycreations.events package xyz.lncvrt.galaxycreations.events
import org.bukkit.entity.Vehicle import org.bukkit.entity.Player
import org.bukkit.event.EventHandler import org.bukkit.event.EventHandler
import org.bukkit.event.Listener import org.bukkit.event.Listener
import org.bukkit.event.block.Action import org.bukkit.event.block.Action
@@ -13,8 +13,8 @@ class PlayerInteractListener : Listener {
val item = event.item ?: return val item = event.item ?: return
if (item.type.name.contains("MINECART")) { if (item.type.name.contains("MINECART")) {
val chunk = event.clickedBlock?.location?.chunk ?: return val chunk = event.clickedBlock?.location?.chunk ?: return
val vehicles = chunk.entities.filterIsInstance<Vehicle>() val entities = chunk.entities.filter { it !is Player }
if (vehicles.size > 9) vehicles.forEach { it.remove() } if (entities.size > 9) entities.forEach { it.remove() }
} }
} }
} }

View File

@@ -1,6 +1,6 @@
package xyz.lncvrt.galaxycreations.events package xyz.lncvrt.galaxycreations.events
import org.bukkit.entity.Vehicle import org.bukkit.entity.Player
import org.bukkit.event.EventHandler import org.bukkit.event.EventHandler
import org.bukkit.event.Listener import org.bukkit.event.Listener
import org.bukkit.event.vehicle.VehicleCreateEvent import org.bukkit.event.vehicle.VehicleCreateEvent
@@ -9,7 +9,7 @@ class VehicleCreateListener : Listener {
@EventHandler @EventHandler
fun onVehicleCreateEvent(event: VehicleCreateEvent) { fun onVehicleCreateEvent(event: VehicleCreateEvent) {
val chunk = event.vehicle.location.chunk val chunk = event.vehicle.location.chunk
val vehicles = chunk.entities.filterIsInstance<Vehicle>() val entities = chunk.entities.filter { it !is Player }
if (vehicles.size > 9) vehicles.forEach { it.remove() } if (entities.size > 9) entities.forEach { it.remove() }
} }
} }

View File

@@ -1,6 +1,6 @@
package xyz.lncvrt.galaxycreations.events package xyz.lncvrt.galaxycreations.events
import org.bukkit.entity.Vehicle import org.bukkit.entity.Player
import org.bukkit.event.EventHandler import org.bukkit.event.EventHandler
import org.bukkit.event.Listener import org.bukkit.event.Listener
import org.bukkit.event.vehicle.VehicleMoveEvent import org.bukkit.event.vehicle.VehicleMoveEvent
@@ -9,7 +9,7 @@ class VehicleMoveListener : Listener {
@EventHandler @EventHandler
fun onVehicleMoveEvent(event: VehicleMoveEvent) { fun onVehicleMoveEvent(event: VehicleMoveEvent) {
val chunk = event.vehicle.location.chunk val chunk = event.vehicle.location.chunk
val vehicles = chunk.entities.filterIsInstance<Vehicle>() val entities = chunk.entities.filter { it !is Player }
if (vehicles.size > 9) vehicles.forEach { it.remove() } if (entities.size > 9) entities.forEach { it.remove() }
} }
} }