mirror of
https://github.com/YouHaveTrouble/PreventStabby.git
synced 2026-05-12 05:16:55 +00:00
Compare commits
5 Commits
v1.10.2
...
2.0.0-rc-1
| Author | SHA1 | Date | |
|---|---|---|---|
| eb657798e4 | |||
| d15ccbef20 | |||
| 8ae6e9212c | |||
| fec1dd2ab6 | |||
| fba2f03aab |
@@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>me.youhavetrouble</groupId>
|
||||
<artifactId>PreventStabby</artifactId>
|
||||
<version>1.10.2</version>
|
||||
<version>1.11.1</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>PreventStabby</name>
|
||||
|
||||
@@ -45,4 +45,9 @@ public class PlayerEnterCombatEvent extends Event implements Cancellable {
|
||||
public HandlerList getHandlers() {
|
||||
return HANDLERS;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static HandlerList getHandlerList() {
|
||||
return HANDLERS;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -45,4 +45,9 @@ public class PlayerLeaveCombatEvent extends Event implements Cancellable {
|
||||
public HandlerList getHandlers() {
|
||||
return HANDLERS;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static HandlerList getHandlerList() {
|
||||
return HANDLERS;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -59,4 +59,9 @@ public class PlayerTogglePvpEvent extends Event {
|
||||
public HandlerList getHandlers() {
|
||||
return HANDLERS;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public static HandlerList getHandlerList() {
|
||||
return HANDLERS;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,7 +24,6 @@ public class PluginMessages {
|
||||
}
|
||||
|
||||
public static Component parseMessage(CommandSender sender,String message) {
|
||||
|
||||
if (sender instanceof Player && isPlaceholderApiEnabled()) {
|
||||
Player player = (Player) sender;
|
||||
message = PlaceholderAPI.setPlaceholders(player, message);
|
||||
@@ -37,15 +36,18 @@ public class PluginMessages {
|
||||
}
|
||||
|
||||
public static void sendMessage(CommandSender sender, String message) {
|
||||
if ("".equals(message)) return;
|
||||
audiences.sender(sender).sendMessage(parseMessage(sender, message));
|
||||
}
|
||||
|
||||
public static void sendActionBar(Player player, String message) {
|
||||
if ("".equals(message)) return;
|
||||
Component parsedMessage = parseMessage(player, message);
|
||||
audiences.player(player).sendActionBar(parsedMessage);
|
||||
}
|
||||
|
||||
public static void sendActionBar(UUID uuid, String message) {
|
||||
if ("".equals(message)) return;
|
||||
Player player = Bukkit.getPlayer(uuid);
|
||||
if (player == null) return;
|
||||
sendActionBar(player, message);
|
||||
@@ -57,6 +59,7 @@ public class PluginMessages {
|
||||
}
|
||||
|
||||
public static void broadcastMessage(Player player, String message) {
|
||||
if ("".equals(message)) return;
|
||||
message = parsePlayerName(player, message);
|
||||
if (PreventStabby.getPlugin().getServer().getPluginManager().getPlugin("PlaceholderAPI") != null) {
|
||||
message = PlaceholderAPI.setPlaceholders(player, message);
|
||||
@@ -65,6 +68,7 @@ public class PluginMessages {
|
||||
}
|
||||
|
||||
public static void broadcastMessage(String message) {
|
||||
if ("".equals(message)) return;
|
||||
audiences.all().sendMessage(parseMessage(message));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user