Skip to content

Commit 9f64c8e

Browse files
committed
chore(bukkit): only disable join/quit message if the player is vanished
1 parent eb1729a commit 9f64c8e

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ description=A modular vanish system for Minecraft servers
3030
website=https://sayandev.org
3131
author=Syrent
3232

33-
version=1.0.0
33+
version=1.0.1-SNAPSHOT

sayanvanish-bukkit/src/main/kotlin/org/sayandev/sayanvanish/bukkit/feature/features/FeatureFakeMessage.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ package org.sayandev.sayanvanish.bukkit.feature.features
33
import org.bukkit.event.EventHandler
44
import org.bukkit.event.player.PlayerJoinEvent
55
import org.bukkit.event.player.PlayerQuitEvent
6+
import org.sayandev.sayanvanish.api.Permission
67
import org.sayandev.sayanvanish.api.feature.Configurable
78
import org.sayandev.sayanvanish.api.feature.RegisteredFeature
9+
import org.sayandev.sayanvanish.bukkit.api.SayanVanishBukkitAPI.Companion.user
810
import org.sayandev.sayanvanish.bukkit.api.event.BukkitUserUnVanishEvent
911
import org.sayandev.sayanvanish.bukkit.api.event.BukkitUserVanishEvent
1012
import org.sayandev.sayanvanish.bukkit.feature.ListenedFeature
@@ -29,6 +31,8 @@ class FeatureFakeMessage(
2931
@EventHandler
3032
private fun onJoin(event: PlayerJoinEvent) {
3133
if (!isActive()) return
34+
val user = event.player.user(false) ?: return
35+
if (!user.isVanished || user.hasPermission(Permission.VANISH_ON_JOIN)) return
3236
if (disableJoinMessageIfVanished) {
3337
event.joinMessage = null
3438
}
@@ -37,6 +41,8 @@ class FeatureFakeMessage(
3741
@EventHandler
3842
private fun onQuit(event: PlayerQuitEvent) {
3943
if (!isActive()) return
44+
val user = event.player.user() ?: return
45+
if (!user.isVanished) return
4046
if (disableQuitMessageIfVanished) {
4147
event.quitMessage = null
4248
}

0 commit comments

Comments
 (0)