Jaki/SteamWar
1
0
Fork 0
forked from SteamWar/SteamWar
Code Pull Requests Activity

Format code

Browse Source
This commit is contained in:
YoyoNow
2026-05-16 23:08:09 +02:00
parent 81dd8045f2
commit d110df924e
562 changed files with 11025 additions and 10059 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueConfig.kt
+11 -4
View File
@@ -53,7 +53,8 @@ data class TNTLeagueConfig(
init {
if (eventFightId != null && eventFightId > 0) {
eventFight = EventFight.byId(eventFightId) ?: throw IllegalArgumentException("EventFight with ID $eventFightId not found")
eventFight = EventFight.byId(eventFightId)
?: throw IllegalArgumentException("EventFight with ID $eventFightId not found")
event = Event.byId(eventFight.eventID)!!
@@ -80,14 +81,20 @@ data class TNTLeagueConfig(
Price(
config.getInt("$it.amount"),
config.getInt("$it.price"),
config.getString("$it.category")?.let { s -> categoryFromString[s] } ?: ItemCategory.REDSTONE,
config.getString("$it.category")?.let { s -> categoryFromString[s] }
?: ItemCategory.REDSTONE,
config.getInt("$it.pinned", -1),
config.getStringList("$it.extras").map { s -> extrasFromString[s]!! }.toSet()
)
}.mapKeys { Material.getMaterial(it.key) ?: Material.BARRIER }
}.mapKeys {
Material.getMaterial(it.key)
?: Material.BARRIER
}
}
fun isEvent() = (config.eventFightId ?: 0) > 0
fun isEvent() =
(config.eventFightId
?: 0) > 0
}
data class Price(
TNTLeague/src/de/steamwar/tntleague/config/TNTLeagueWorldConfig.kt
+2 -1
View File
@@ -76,7 +76,8 @@ object TNTLeagueWorldConfig {
}
fun ConfigurationSection.getWorldLocation(s: String, default: Location? = null): Location {
val section = getConfigurationSection(s) ?: return default!!
val section = getConfigurationSection(s)
?: return default!!
val x = section.getDouble("x")
val y = section.getDouble("y")
TNTLeague/src/de/steamwar/tntleague/config/TeamConfig.kt
+11 -10
View File
@@ -53,15 +53,16 @@ data class TeamWorldConfig(
return TeamWorldConfig(spawnLocation, dealerSpawn, itemSpawn, Area(targetPos1, targetPos2))
}
private fun spawnDealer(loc: Location) = world.spawn(loc, WanderingTrader::class.java)
.apply {
customName(Component.text("Shop"))
isCustomNameVisible = false
isInvulnerable = true
isSilent = true
isCollidable = false
isAware = false
setAI(false)
}
private fun spawnDealer(loc: Location) =
world.spawn(loc, WanderingTrader::class.java)
.apply {
customName(Component.text("Shop"))
isCustomNameVisible = false
isInvulnerable = true
isSilent = true
isCollidable = false
isAware = false
setAI(false)
}
}
}