v3.1.1

- Fixed a bug which caused problems with deleted/invalid particle effect IDs on Entities

Author: randombyte-developer

build.gradle

@@ -28,7 +28,7 @@ if (!isJitpack) {
 apply plugin: "net.minecraftforge.gradle.forge"
 
 group "de.randombyte"
-version "3.1.0"
+version "3.1.1"
 
 minecraft {
     version = "1.12.2-14.23.5.2768"
@@ -53,7 +53,7 @@ dependencies {
     kapt "org.spongepowered:spongeapi:7.0.0"
     shadow("com.github.randombyte-developer.kosp:kosp:v2.2.3") { transitive = false }
     shadow "org.bstats:bstats-sponge:1.2"
-    compile files("libs/Pixelmon-1.12.2-7.0.1-server.jar")
+    compile files("libs/Pixelmon-1.12.2-7.0.3.jar")
 }
 
 shadowJar {

src/main/kotlin/de/randombyte/entityparticles/EntityParticles.kt

@@ -69,7 +69,7 @@ class EntityParticles @Inject constructor(
     internal companion object {
         const val ID = "entity-particles"
         const val NAME = "EntityParticles"
-        const val VERSION = "3.1.0"
+        const val VERSION = "3.1.1"
         const val AUTHOR = "RandomByte"
 
         const val ROOT_PERMISSION = ID
@@ -79,6 +79,9 @@ class EntityParticles @Inject constructor(
 
         const val PIXELMON_ID = "pixelmon"
         const val PIXELMON_PARTICLE_TAG_KEY = "$ID:particle"
+
+        private val _INSTANCE = lazy { Sponge.getPluginManager().getPlugin(EntityParticles.ID).get().instance.get() as EntityParticles }
+        val INSTANCE: EntityParticles get() = _INSTANCE.value
     }
 
     private val configManager = ConfigManager(
@@ -141,16 +144,21 @@ class EntityParticles @Inject constructor(
     fun onLoadEntity(event: SpawnEntityEvent) {
         event.entities
                 .filter { it.particleId != null }
-                .forEach {
-                    val worldUuid = it.location.extent.uniqueId
-                    val entities = trackedEntities.getOrPut(worldUuid) { mutableMapOf() }
-                    entities += it.uniqueId to it.particleId!!
-                }
+                .forEach { addTrackedEntity(it) }
     }
 
     @Listener
     fun onUnloadEntity(event: DestructEntityEvent) {
-        trackedEntities[event.targetEntity.location.extent.uniqueId]?.remove(event.targetEntity.uniqueId)
+        removeTrackedEntity(event.targetEntity)
+    }
+
+    fun addTrackedEntity(entity: Entity) {
+        val trackedEntities = trackedEntities.getOrPut(entity.location.extent.uniqueId) { mutableMapOf() }
+        trackedEntities += entity.uniqueId to entity.particleId!!
+    }
+
+    fun removeTrackedEntity(entity: Entity) {
+        trackedEntities[entity.location.extent.uniqueId]?.remove(entity.uniqueId)
     }
 
     private fun loadConfig() {
@@ -260,7 +268,13 @@ class EntityParticles @Inject constructor(
                                     entity to id
                                 }
                                 .forEach entityLoop@ { (entity, id) ->
-                                    val particleConfig = config.particles.getValue(id)
+                                    val particleConfig = config.particles[id]
+                                    if (particleConfig == null) {
+                                        entity.particleId = null
+                                        removeTrackedEntity(entity)
+
+                                        return@entityLoop
+                                    }
                                     particleConfig.effects.forEach { effect ->
                                         val doEffectThisTick = Sponge.getServer().runningTimeTicks % effect.interval == 0
                                         if (doEffectThisTick) {

src/main/kotlin/de/randombyte/entityparticles/commands/SetParticleCommand.kt

@@ -34,14 +34,11 @@ internal class SetParticleCommand(
         val entity = (world.getEntity(entityUuidString.toUUID()).orNull()
                 ?: throw CommandException("Entity '$entityUuidString' in world '$world' is not available!".toText()))
 
-        val entityParticles = Sponge.getPluginManager().getPlugin(EntityParticles.ID).get().instance.get() as EntityParticles
-        val trackedEntities = entityParticles.trackedEntities.getOrPut(entity.location.extent.uniqueId) { mutableMapOf() }
-
         if (particleId == "nothing") {
             entity.particleId = null
             entity.offer(Keys.GLOWING, false)
 
-            trackedEntities -= (entity.uniqueId)
+            EntityParticles.INSTANCE.removeTrackedEntity(entity)
 
             return CommandResult.success()
         }
@@ -55,7 +52,7 @@ internal class SetParticleCommand(
             entity.offer(Keys.GLOWING, true)
         }
 
-        trackedEntities += entity.uniqueId to particleId
+        EntityParticles.INSTANCE.addTrackedEntity(entity)
 
         return CommandResult.success()
     }