Skip to content

Commit 736fafc

Browse files
committed
WorldEdit compatibility fixed.
Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>
1 parent e4f9557 commit 736fafc

File tree

2 files changed

+9
-20
lines changed

2 files changed

+9
-20
lines changed

src/main/java/com/mairwunnx/projectessentials/permissions/impl/WorldEditEventHandler.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

src/main/kotlin/com/mairwunnx/projectessentials/permissions/impl/ModuleObject.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@file:Suppress("unused")
1+
@file:Suppress("unused", "UNUSED_PARAMETER")
22

33
package com.mairwunnx.projectessentials.permissions.impl
44

@@ -11,6 +11,7 @@ import com.mairwunnx.projectessentials.core.api.v1.module.IModule
1111
import com.mairwunnx.projectessentials.core.api.v1.providers.ProviderAPI
1212
import com.mairwunnx.projectessentials.permissions.api.v1.PermissionsAPI
1313
import com.mairwunnx.projectessentials.permissions.api.v1.PermissionsWrappersAPI
14+
import com.mairwunnx.projectessentials.permissions.api.v1.PermissionsWrappersAPI.WorldEditWrapper
1415
import com.mairwunnx.projectessentials.permissions.impl.commands.ConfigurePermissionsCommand
1516
import com.mairwunnx.projectessentials.permissions.impl.commands.PermissionsCommand
1617
import com.mairwunnx.projectessentials.permissions.impl.configurations.PermissionsConfiguration
@@ -23,6 +24,7 @@ import net.minecraftforge.event.world.BlockEvent
2324
import net.minecraftforge.eventbus.api.SubscribeEvent
2425
import net.minecraftforge.fml.ModList
2526
import net.minecraftforge.fml.common.Mod
27+
import net.minecraftforge.fml.event.server.FMLServerStartedEvent
2628
import net.minecraftforge.server.permission.PermissionAPI
2729
import org.apache.logging.log4j.LogManager
2830

@@ -31,6 +33,7 @@ internal class ModuleObject : IModule {
3133
override val name = this::class.java.`package`.implementationTitle.split(" ").last()
3234
override val version = this::class.java.`package`.implementationVersion!!
3335
override val loadIndex = 1
36+
override fun init() = Unit
3437

3538
private val logger = LogManager.getLogger()
3639

@@ -67,16 +70,13 @@ internal class ModuleObject : IModule {
6770
}
6871
}
6972

70-
fun replaceWorldEditPermissionHandler() =
71-
logger.info("Replacing default WorldEdit permissions handler").run {
72-
ForgeWorldEdit.inst.permissionsProvider = PermissionsWrappersAPI.WorldEditWrapper
73-
}
74-
75-
override fun init() {
73+
@SubscribeEvent
74+
fun onServerReady(e: FMLServerStartedEvent) {
7675
ModList.get().mods.find { it.modId == "worldedit" }?.let {
7776
if (permissionsSettings.configuration.replaceWorldEditPermissionsHandler) {
78-
logger.info("WorldEdit mod found and able to replacing permissions handler")
79-
EVENT_BUS.register(WorldEditEventHandler::class.java)
77+
logger.info("Replacing default WorldEdit permissions handler").run {
78+
ForgeWorldEdit.inst.permissionsProvider = WorldEditWrapper
79+
}
8080
}
8181
}
8282
}

0 commit comments

Comments
 (0)