Upstream
/
EpicVouchers
mirror of https://github.com/songoda/EpicVouchers.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Second hotfix for: SD-3014. 

This time, it REALLY fixed the problem.
This commit is contained in:
Stefano Haagmans 2019-07-18 19:48:53 +02:00
parent 19abda9d85
commit e0e7cab543
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables:
name: "EpicVouchers"
path: "/builds/$CI_PROJECT_PATH"
version: "2.1.4"
version: "2.1.5"
build:
stage: build

13
src/main/java/com/songoda/epicvouchers/voucher/Voucher.java
View File

@ -18,7 +18,6 @@ import org.bukkit.inventory.meta.ItemMeta;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static com.songoda.epicvouchers.utils.Methods.format;
@ -144,15 +143,15 @@ public class Voucher {
public void give(CommandSender sender, List<Player> players, int amount) {
String giveMessage = instance.getLocale().getMessage("command.give.send")
.replaceAll(Pattern.quote("%player%"), players.size() == 1 ? players.get(0).getName() : "everyone")
.replaceAll(Pattern.quote("%voucher%"), Matcher.quoteReplacement(getName(true)))
.replaceAll(Pattern.quote("%amount%"), String.valueOf(amount));
.replaceAll("%player%", players.size() == 1 ? players.get(0).getName() : "everyone")
.replaceAll("%voucher%", Matcher.quoteReplacement(getName(true)))
.replaceAll("%amount%", String.valueOf(amount));
for (Player player : players) {
String receiveMessage = instance.getLocale().getMessage("command.give.receive")
.replaceAll(Pattern.quote("%voucher%"), getName(true))
.replaceAll(Pattern.quote("%player%"), player.getName())
.replaceAll(Pattern.quote("%amount%"), String.valueOf(amount));
.replaceAll("%voucher%", Matcher.quoteReplacement(getName(true)))
.replaceAll("%player%", player.getName())
.replaceAll("%amount%", String.valueOf(amount));
VoucherReceiveEvent event = new VoucherReceiveEvent(player, getName(true), toItemStack(amount), amount, sender);
Bukkit.getServer().getPluginManager().callEvent(event);