Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add silence leave for premiumvanish #168

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: add silence leave for premiumvanish #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions multichat/dependency-reduced-pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>xyz.olivermartin.multichat</groupId>
<artifactId>multichat</artifactId>
<version>1.9.6</version>
<version>1.9.7</version>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -47,7 +47,7 @@
</repository>
<repository>
<id>sponge</id>
<url>http://repo.spongepowered.org/maven</url>
<url>https://repo.spongepowered.org/maven</url>
</repository>
<repository>
<id>bungeecord-repo</id>
Expand All @@ -59,11 +59,11 @@
</repository>
<repository>
<id>vault-repo</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
<url>https://ci.ender.zone/plugin/repository/everything</url>
</repository>
<repository>
<id>placeholderapi</id>
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
<repository>
<id>jitpack.io</id>
Expand Down Expand Up @@ -294,4 +294,3 @@
</dependency>
</dependencies>
</project>

10 changes: 5 additions & 5 deletions multichat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>xyz.olivermartin.multichat</groupId>
<artifactId>multichat</artifactId>
<version>1.9.6</version>
<version>1.9.7</version>

<repositories>

Expand All @@ -16,7 +16,7 @@

<repository>
<id>sponge</id>
<url>http://repo.spongepowered.org/maven</url>
<url>https://repo.spongepowered.org/maven</url>
</repository>

<repository>
Expand All @@ -31,12 +31,12 @@

<repository>
<id>vault-repo</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
<url>https://ci.ender.zone/plugin/repository/everything</url>
</repository>

<repository>
<id>placeholderapi</id>
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>

<repository>
Expand Down Expand Up @@ -167,4 +167,4 @@

</dependencies>

</project>
</project>
5 changes: 5 additions & 0 deletions multichat/src/main/java/xyz/olivermartin/multichat/bungee/Events.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,11 @@ public void onLogout(PlayerDisconnectEvent event) {

if ( ConfigManager.getInstance().getHandler("joinmessages.yml").getConfig().getBoolean("showquit") == true ) {

// PremiumVanish support, return as early as possible to avoid loading unnecessary resources
if (MultiChat.premiumVanish && MultiChat.hideVanishedStaffInLeave && BungeeVanishAPI.isInvisible(player)) {
return;
}

String joinformat = ConfigManager.getInstance().getHandler("joinmessages.yml").getConfig().getString("networkquit");
String silentformat = ConfigManager.getInstance().getHandler("joinmessages.yml").getConfig().getString("silentquit");

Expand Down
2 changes: 2 additions & 0 deletions multichat/src/main/java/xyz/olivermartin/multichat/bungee/MultiChat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ public class MultiChat extends Plugin implements Listener {
public static boolean hideVanishedStaffInMsg = true;
public static boolean hideVanishedStaffInStaffList = true;
public static boolean hideVanishedStaffInJoin = true;
public static boolean hideVanishedStaffInLeave = true;

public static List<String> legacyServers = new ArrayList<String>();

Expand Down Expand Up @@ -383,6 +384,7 @@ public void onEnable() {
hideVanishedStaffInMsg = configYML.getBoolean("premium_vanish.prevent_message");
hideVanishedStaffInStaffList = configYML.getBoolean("premium_vanish.prevent_staff_list");
hideVanishedStaffInJoin = configYML.getBoolean("premium_vanish.silence_join");
hideVanishedStaffInLeave = configYML.getBoolean("premium_vanish.silence_leave");
}

}
Expand Down
1 change: 1 addition & 0 deletions multichat/src/main/java/xyz/olivermartin/multichat/bungee/commands/MultiChatCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ public void execute(CommandSender sender, String[] args) {
MultiChat.hideVanishedStaffInMsg = ConfigManager.getInstance().getHandler("config.yml").getConfig().getSection("premium_vanish").getBoolean("prevent_message");
MultiChat.hideVanishedStaffInStaffList = ConfigManager.getInstance().getHandler("config.yml").getConfig().getSection("premium_vanish").getBoolean("prevent_staff_list");
MultiChat.hideVanishedStaffInJoin = ConfigManager.getInstance().getHandler("config.yml").getConfig().getSection("premium_vanish").getBoolean("silence_join");
MultiChat.hideVanishedStaffInLeave = ConfigManager.getInstance().getHandler("config.yml").getConfig().getSection("premium_vanish").getBoolean("silence_leave");
}

} else {
Expand Down
1 change: 1 addition & 0 deletions multichat/src/main/resources/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ premium_vanish:
prevent_message: true # Prevent players being able to /msg vanished staff
prevent_staff_list: true # Prevent vanished staff showing up in /staff
silence_join: true # Prevent vanished players sending a join message
silence_leave: true # Prevent vanished players sending a leave message

# Legacy (PRE-1.16) Servers
# Listing servers here will mark them as 'LEGACY' servers
Expand Down
1 change: 1 addition & 0 deletions multichat/src/main/resources/config_fr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ premium_vanish:
prevent_message: true # Bloquer l'utilisation de la commande /msg
prevent_staff_list: true # Masquer de la liste /staff
silence_join: true # Prevent vanished players sending a join message
silence_leave: true # Prevent vanished players sending a leave message

# Legacy (PRE-1.16) Servers
# Listing servers here will mark them as 'LEGACY' servers
Expand Down