Skip to content

Commit a0a6f66

Browse files
Re-apply #1
1 parent ba3c3c2 commit a0a6f66

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

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

+10-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import org.spongepowered.api.event.filter.cause.First
4444
import org.spongepowered.api.event.game.GameReloadEvent
4545
import org.spongepowered.api.event.game.state.GameLoadCompleteEvent
4646
import org.spongepowered.api.event.game.state.GamePreInitializationEvent
47+
import org.spongepowered.api.event.game.state.GameStartingServerEvent
4748
import org.spongepowered.api.event.item.inventory.UseItemStackEvent
4849
import org.spongepowered.api.item.inventory.ItemStack
4950
import org.spongepowered.api.plugin.Dependency
@@ -116,7 +117,6 @@ class EntityParticles @Inject constructor(
116117
fun onGameLoadComplete(event: GameLoadCompleteEvent) {
117118
loadConfig()
118119
registerCommands()
119-
startParticleTask()
120120

121121
logger.info("$NAME loaded: $VERSION")
122122
}
@@ -129,6 +129,11 @@ class EntityParticles @Inject constructor(
129129
logger.info("Reloaded!")
130130
}
131131

132+
@Listener
133+
fun onServerStarting(event: GameStartingServerEvent) {
134+
startParticleTask()
135+
}
136+
132137
@Listener
133138
fun onLoadEntity(event: SpawnEntityEvent) {
134139
event.entities
@@ -240,6 +245,10 @@ class EntityParticles @Inject constructor(
240245
Task.builder()
241246
.intervalTicks(1)
242247
.execute { ->
248+
if (!Sponge.isServerAvailable()) {
249+
return@execute
250+
}
251+
243252
Sponge.getServer().worlds.forEach worldLoop@ { world ->
244253
(trackedEntities[world.uniqueId] ?: return@worldLoop)
245254
.mapNotNull { (uuid, id) ->

0 commit comments

Comments
 (0)