Skip to content

Commit 9fee505

Browse files
Merge branch 'main' into no-tnt
2 parents 9485fa3 + f53eb0f commit 9fee505

File tree

4 files changed

+30
-2
lines changed

4 files changed

+30
-2
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>parallelmc</groupId>
88
<artifactId>parallelutils</artifactId>
9-
<version>1.2.1</version>
9+
<version>1.2.2</version>
1010
<packaging>jar</packaging>
1111

1212
<name>Parallelutils</name>

src/main/java/parallelmc/parallelutils/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public class Constants {
44

5-
public static final Version VERSION = new Version(1, 2, 1);
5+
public static final Version VERSION = new Version(1, 2, 2);
66
public static final String PLUGIN_NAME = "ParallelUtils";
77
public static final String DEFAULT_WORLD = "world";
88
}

src/main/java/parallelmc/parallelutils/modules/discordintegration/FrozenJoinQuitSuppressorListener.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package parallelmc.parallelutils.modules.discordintegration;
22

3+
import net.kyori.adventure.text.Component;
4+
import net.kyori.adventure.text.format.NamedTextColor;
5+
import net.kyori.adventure.text.format.TextDecoration;
6+
import net.kyori.adventure.text.format.TextFormat;
37
import org.bukkit.Bukkit;
48
import org.bukkit.Server;
59
import org.bukkit.entity.Player;
@@ -11,6 +15,15 @@
1115

1216
public class FrozenJoinQuitSuppressorListener implements Listener {
1317

18+
private final Component joinMessage;
19+
20+
public FrozenJoinQuitSuppressorListener() {
21+
joinMessage = Component.text("[", NamedTextColor.DARK_AQUA)
22+
.append(Component.text("P", NamedTextColor.WHITE, TextDecoration.BOLD))
23+
.append(Component.text("]", NamedTextColor.DARK_AQUA))
24+
.append(Component.text(" You are currently vanished from ParallelUtils!", NamedTextColor.AQUA));
25+
}
26+
1427
@EventHandler(priority = EventPriority.LOWEST) // This is event priority abuse
1528
public void onFrozenJoin(PlayerJoinEvent event) {
1629
Player player = event.getPlayer();
@@ -22,6 +35,7 @@ public void onFrozenJoin(PlayerJoinEvent event) {
2235
if (Bukkit.getPluginManager().isPluginEnabled("Essentials")) {
2336
Server server = Bukkit.getServer();
2437
server.dispatchCommand(server.getConsoleSender(), "v " + player.getName().strip());
38+
player.sendMessage(joinMessage);
2539
}
2640
}
2741
}

src/main/java/parallelmc/parallelutils/modules/discordintegration/JoinQuitSuppressorListener.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package parallelmc.parallelutils.modules.discordintegration;
22

33
import net.kyori.adventure.text.Component;
4+
import net.kyori.adventure.text.format.NamedTextColor;
5+
import net.kyori.adventure.text.format.TextDecoration;
46
import org.bukkit.Bukkit;
57
import org.bukkit.Server;
68
import org.bukkit.entity.Player;
@@ -20,6 +22,17 @@ public class JoinQuitSuppressorListener implements Listener {
2022
public static ArrayList<String> hiddenUsers = new ArrayList<>();
2123
public static final Object hiddenUsersLock = new Object();
2224

25+
26+
private final Component joinMessage;
27+
28+
public JoinQuitSuppressorListener() {
29+
joinMessage = Component.text("[", NamedTextColor.DARK_AQUA)
30+
.append(Component.text("P", NamedTextColor.WHITE, TextDecoration.BOLD))
31+
.append(Component.text("]", NamedTextColor.DARK_AQUA))
32+
.append(Component.text(" You are currently vanished from ParallelUtils!", NamedTextColor.AQUA));
33+
}
34+
35+
2336
@EventHandler (priority = EventPriority.HIGHEST)
2437
public void onPlayerJoin(PlayerJoinEvent event) {
2538
Player player = event.getPlayer();
@@ -31,6 +44,7 @@ public void onPlayerJoin(PlayerJoinEvent event) {
3144
if (Bukkit.getPluginManager().isPluginEnabled("Essentials")) {
3245
Server server = Bukkit.getServer();
3346
server.dispatchCommand(server.getConsoleSender(), "v " + player.getName().strip());
47+
player.sendMessage(joinMessage);
3448
}
3549
}
3650
}

0 commit comments

Comments
 (0)