tale
/
ProjectAres
mirror of https://github.com/OvercastNetwork/ProjectAres.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix mvp and tokens revealing nicks

This commit is contained in:
BuildTools 2017-06-19 11:52:30 -07:00
parent 0825692267
commit 0141d4cf92
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Commons/core/src/main/i18n/templates/pgm/PGMMessages.properties
View File

@ -152,7 +152,9 @@ rating.create.notify.ffa = Someone rated this map {0}
rating.update.notify.ffa = Someone re-rated this map from {1} to {0}
tokens.map.fail = You do not have enough Map tokens
tokens.map.find = {0} has won a Mutation Token!
tokens.mutation.fail = You do not have enough Mutation tokens
tokens.mutation.find = {0} has won a SetNext Token!
shop.plug.neverKicked = Premium users are never kicked off teams!
shop.plug.neverSwitched = Premium users are never forced to switch teams!

5
PGM/src/main/java/tc/oc/pgm/highlights/HighlightListener.java
View File

@ -5,6 +5,7 @@ import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import tc.oc.commons.bukkit.chat.NameStyle;
import tc.oc.commons.bukkit.tokens.TokenUtil;
import tc.oc.commons.core.chat.Component;
import tc.oc.pgm.Config;
@ -88,10 +89,10 @@ public class HighlightListener implements Listener {
}
subtitle = new Component(bestPlayer.getDisplayName() + appendMe);
} else {
subtitle = new Component(bestPlayer.getDisplayName());
subtitle = new Component(bestPlayer.getStyledName(NameStyle.COLOR));
}
} else {
subtitle = new Component(bestPlayer.getDisplayName());
subtitle = new Component(bestPlayer.getStyledName(NameStyle.COLOR));
}
for (MatchPlayer viewer : event.getMatch().getPlayers()) {

5
PGM/src/main/java/tc/oc/pgm/tokens/TokenListener.java
View File

@ -9,6 +9,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
import tc.oc.commons.bukkit.chat.NameStyle;
import tc.oc.commons.bukkit.event.ObserverKitApplyEvent;
import tc.oc.commons.bukkit.raindrops.RaindropConstants;
import tc.oc.commons.bukkit.tokens.TokenUtil;
@ -62,10 +63,10 @@ public class TokenListener implements Listener {
}
if (Math.random() < chance) {
if (Math.random() > Config.Token.setNextTokenChange()) {
Bukkit.broadcastMessage(player.getDisplayName() + ChatColor.AQUA + " has won a Mutation Token!");
event.getMatch().sendMessage(new TranslatableComponent("tokens.mutation.find", player.getStyledName(NameStyle.COLOR)));
TokenUtil.giveMutationTokens(TokenUtil.getUser(player.getBukkit()), 1);
} else {
Bukkit.broadcastMessage(player.getDisplayName() + ChatColor.AQUA + " has won a SetNext Token!");
event.getMatch().sendMessage(new TranslatableComponent("tokens.map.find", player.getStyledName(NameStyle.COLOR)));
TokenUtil.giveMapTokens(TokenUtil.getUser(player.getBukkit()), 1);
}
}