mirror of
https://github.com/PlaceholderAPI/PlaceholderAPI
synced 2025-09-06 05:17:05 +02:00
Compare commits
6 Commits
feature/up
...
2.11.6
Author | SHA1 | Date | |
---|---|---|---|
|
8b031576aa | ||
|
2d1a0ee157 | ||
|
b9e2bf9429 | ||
|
a35923a117 | ||
|
d5e96bd6a6 | ||
|
7b230fc679 |
@@ -8,7 +8,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "me.clip"
|
group = "me.clip"
|
||||||
version = "2.11.6-DEV-${System.getProperty("BUILD_NUMBER")}"
|
version = "2.11.6"
|
||||||
|
|
||||||
description = "An awesome placeholder provider!"
|
description = "An awesome placeholder provider!"
|
||||||
|
|
||||||
@@ -88,6 +88,8 @@ tasks {
|
|||||||
|
|
||||||
relocate("org.bstats", "me.clip.placeholderapi.metrics")
|
relocate("org.bstats", "me.clip.placeholderapi.metrics")
|
||||||
relocate("net.kyori", "me.clip.placeholderapi.libs.kyori")
|
relocate("net.kyori", "me.clip.placeholderapi.libs.kyori")
|
||||||
|
|
||||||
|
exclude("META-INF/versions/**")
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
|
@@ -68,7 +68,6 @@ public final class PlaceholderAPIPlugin extends JavaPlugin {
|
|||||||
version = 'v' + version.replace('.', '_').replace("_" + minor, "") + '_' + "R" + (minor - 1);
|
version = 'v' + version.replace('.', '_').replace("_" + minor, "") + '_' + "R" + (minor - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
boolean isSpigot;
|
boolean isSpigot;
|
||||||
try {
|
try {
|
||||||
Class.forName("org.spigotmc.SpigotConfig");
|
Class.forName("org.spigotmc.SpigotConfig");
|
||||||
|
@@ -87,7 +87,8 @@ public final class CommandParse extends PlaceholderCommand {
|
|||||||
final boolean command) {
|
final boolean command) {
|
||||||
if (params.size() < 2) {
|
if (params.size() < 2) {
|
||||||
Msg.msg(sender,
|
Msg.msg(sender,
|
||||||
"&cYou must supply a target, and a message: &b/papi " + (broadcast ? "bcparse" : "parse")
|
"&cYou must provide a target and message: &b/papi "
|
||||||
|
+ (command ? "cmdparse" : (broadcast ? "bcparse" : "parse"))
|
||||||
+ " &7{target} &a{message}");
|
+ " &7{target} &a{message}");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -132,24 +133,49 @@ public final class CommandParse extends PlaceholderCommand {
|
|||||||
@NotNull @Unmodifiable final List<String> params) {
|
@NotNull @Unmodifiable final List<String> params) {
|
||||||
if (params.size() < 3) {
|
if (params.size() < 3) {
|
||||||
Msg.msg(sender,
|
Msg.msg(sender,
|
||||||
"&cYou must supply two targets, and a message: &b/papi parserel &7{target one} {target two} &a{message}");
|
"&cYou must supply two targets, and a message: &b/papi parserel &7{target one} "
|
||||||
|
+ "{target two} &a{message}");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final OfflinePlayer targetOne = resolvePlayer(params.get(0));
|
OfflinePlayer playerOne;
|
||||||
if (targetOne == null || !targetOne.isOnline()) {
|
|
||||||
|
if ("me".equalsIgnoreCase(params.get(0))) {
|
||||||
|
if (!(sender instanceof Player)) {
|
||||||
|
Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
playerOne = ((Player) sender);
|
||||||
|
} else {
|
||||||
|
playerOne = resolvePlayer(params.get(0));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (playerOne == null || !playerOne.isOnline()) {
|
||||||
Msg.msg(sender, "&cFailed to find player: &f" + params.get(0));
|
Msg.msg(sender, "&cFailed to find player: &f" + params.get(0));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final OfflinePlayer targetTwo = resolvePlayer(params.get(1));
|
OfflinePlayer playerTwo;
|
||||||
if (targetTwo == null || !targetTwo.isOnline()) {
|
|
||||||
|
if ("me".equalsIgnoreCase(params.get(1))) {
|
||||||
|
if (!(sender instanceof Player)) {
|
||||||
|
Msg.msg(sender, "&cYou must be a player to use &7me&c as a target!");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
playerTwo = ((Player) sender);
|
||||||
|
} else {
|
||||||
|
playerTwo = resolvePlayer(params.get(1));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (playerTwo == null || !playerTwo.isOnline()) {
|
||||||
Msg.msg(sender, "&cFailed to find player: &f" + params.get(1));
|
Msg.msg(sender, "&cFailed to find player: &f" + params.get(1));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
final String message = PlaceholderAPI
|
final String message = PlaceholderAPI
|
||||||
.setRelationalPlaceholders(((Player) targetOne), ((Player) targetTwo),
|
.setRelationalPlaceholders((Player) playerOne, (Player) playerTwo,
|
||||||
String.join(" ", params.subList(2, params.size())));
|
String.join(" ", params.subList(2, params.size())));
|
||||||
|
|
||||||
sender.sendMessage(message);
|
sender.sendMessage(message);
|
||||||
|
Reference in New Issue
Block a user