Skip to content

Commit eca5467

Browse files
feat: conditionally enable special commands based on server type
1 parent a78155d commit eca5467

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

src/main/kotlin/dev/slne/surf/essentials/PaperCommandManager.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ object PaperCommandManager {
2525
giveCommand()
2626
infoCommand()
2727
itemEditCommand()
28-
signCommand()
2928
teleportCommand()
3029
teleportOfflineCommand()
3130
teleportRandomCommand()
@@ -62,7 +61,12 @@ object PaperCommandManager {
6261
soundCommand()
6362
stopCommand()
6463
restartCommand()
65-
makeSpecialCommand()
64+
65+
if (!plugin.isSurvivalServer()) {
66+
makeSpecialCommand()
67+
signCommand()
68+
}
69+
6670
knightCommand()
6771
toolCommand()
6872
experienceCommand()

src/main/kotlin/dev/slne/surf/essentials/PaperMain.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package dev.slne.surf.essentials
22

33
import com.github.shynixn.mccoroutine.folia.SuspendingJavaPlugin
4+
import dev.slne.surf.surfapi.bukkit.api.extensions.pluginManager
45
import org.bukkit.plugin.java.JavaPlugin
56

67
val plugin get() = JavaPlugin.getPlugin(PaperMain::class.java)
@@ -18,4 +19,6 @@ class PaperMain : SuspendingJavaPlugin() {
1819
override fun onDisable() {
1920
super.onDisable()
2021
}
22+
23+
fun isSurvivalServer() = pluginManager.isPluginEnabled("surf-freebuild-bukkit")
2124
}

src/main/kotlin/dev/slne/surf/essentials/listener/SpecialItemListener.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.slne.surf.essentials.listener
22

3+
import dev.slne.surf.essentials.plugin
34
import dev.slne.surf.essentials.service.specialItemService
45
import dev.slne.surf.essentials.util.util.appendNewLineArrow
56
import dev.slne.surf.essentials.util.util.translatable
@@ -28,6 +29,10 @@ object SpecialItemListener : Listener {
2829
val player = event.entity as? Player ?: return
2930
val itemStack = event.item.itemStack
3031

32+
if (plugin.isSurvivalServer()) {
33+
return
34+
}
35+
3136
if (!specialItemService.isSpecial(itemStack)) {
3237
return
3338
}

0 commit comments

Comments
 (0)