ByteDice/BDE_ParticleSys
1
0
Fork 0
Code Issues Pull Requests Actions Releases 1 Wiki Activity

fixed bug where creating a particle with a minecraft: prefix crashes server

Browse Source
This commit is contained in:
ByteDice
2024-12-15 15:29:39 +01:00
parent b1832825a8
commit ddd78dcef4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/kotlin/com/bytedice/bde_particles/commands/ManageEmitters.kt
+4 -2
View File
@@ -122,12 +122,14 @@ object ManageEmitters {
} }
private fun createExec(context: CommandContext<ServerCommandSource>, newEmitterId: String, presetEmitterId: String) { private fun createExec(context: CommandContext<ServerCommandSource>, newEmitterId: String, presetEmitterId: String) {
val params = getEmitterDataById(presetEmitterId) val params = getEmitterDataById(presetEmitterId)?.copy()
val usedDefault = params == null val usedDefault = params == null
println(params?.modelCurve?.array?.size)
val result = addToRegister( val result = addToRegister(
newEmitterId, newEmitterId,
if (usedDefault) { EmitterParams.DEFAULT } else { params!! }, params ?: EmitterParams.DEFAULT,
) )
if (usedDefault && result.second) { if (usedDefault && result.second) {
src/main/kotlin/com/bytedice/bde_particles/particles/ParticleIdRegister.kt
+3 -5
View File
@@ -29,13 +29,11 @@ fun addToRegister(id: String, params: EmitterParams) : Pair<String, Boolean> {
for (model in params.modelCurve.array) { for (model in params.modelCurve.array) {
val modelModIdRegex = ".*:".toRegex() val modelModIdRegex = ".*:".toRegex()
if (modelModIdRegex.containsMatchIn(model)) { break } if (modelModIdRegex.containsMatchIn(model)) { newModels.add(model) }
else { else { newModels.add("minecraft:$model") }
newModels.add("minecraft:$model")
}
} }
params.modelCurve = ParamClasses.StringCurve(newModels.toTypedArray(), params.modelCurve.curve) params.modelCurve.array = newModels.toTypedArray()
idRegister[id] = params idRegister[id] = params
println("BPS - Registered Emitter ID \"$newId\".") println("BPS - Registered Emitter ID \"$newId\".")