TotalFreedomMC/TF-Marriage
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-Marriage.git synced 2025-02-11 03:30:01 +00:00
Code Issues Projects Releases Wiki Activity

Add permission for chat color

Browse source
This commit is contained in:
Lennart ten Wolde 2016-06-14 17:35:22 +02:00
parent b431e5abc1
commit 66e856bb87
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/lenis0012/bukkit/marriage2/MarriageAPI.java
View file

@ -8,19 +8,19 @@ import com.lenis0012.bukkit.marriage2.internal.MarriagePlugin;
* <b>Changelog:</b> * <b>Changelog:</b>
* 1.02: * 1.02:
* <ul> * <ul>
* <li>Added {@link com.lenis0012.bukkit.marriage2.events.PlayerMarryEvent PlayerMarryEvent}</li> * <li>Added {@link com.lenis0012.bukkit.marriage2.events.PlayerMarryEvent PlayerMarryEvent}</li>
* <li>Added {@link com.lenis0012.bukkit.marriage2.events.PlayerDivorceEvent PlayerDivorceEvent}</li> * <li>Added {@link com.lenis0012.bukkit.marriage2.events.PlayerDivorceEvent PlayerDivorceEvent}</li>
* <li>Added {@link Marriage#marry(MPlayer, MPlayer, MPlayer) marry(p1, p2, priest)}</li> * <li>Added {@link Marriage#marry(MPlayer, MPlayer, MPlayer) marry(p1, p2, priest)}</li>
* </ul> * </ul>
* <p> * <p>
* 1.01: * 1.01:
* <ul> * <ul>
* <li>Added chat spy mode</li> * <li>Added chat spy mode</li>
* </ul> * </ul>
* <p> * <p>
* 1.00: * 1.00:
* <ul> * <ul>
* <li>Release</li> * <li>Release</li>
* </ul> * </ul>
*/ */
public class MarriageAPI { public class MarriageAPI {

8
src/main/java/com/lenis0012/bukkit/marriage2/config/Permissions.java
View file

@ -20,6 +20,7 @@ public enum Permissions {
*/ */
UPDATE("marry.update", 1), UPDATE("marry.update", 1),
CHAT_SPY("marry.chatspy", 1), CHAT_SPY("marry.chatspy", 1),
MIGRATE("marry.migrate", 1),
/** /**
* Player commands * Player commands
*/ */
@ -30,7 +31,12 @@ public enum Permissions {
SET_HOME("marry.sethome"), SET_HOME("marry.sethome"),
GIFT("marry.gift"), GIFT("marry.gift"),
CHAT("marry.chat"), CHAT("marry.chat"),
SEEN("marry.seen"); SEEN("marry.seen"),
HEAL("marry.heal"),
/**
* Non-commands
*/
CHAT_COLOR("marry.color", 1);
private static boolean vaultEnabled = false; private static boolean vaultEnabled = false;
private static Permission permissionService; private static Permission permissionService;

5
src/main/java/com/lenis0012/bukkit/marriage2/listeners/ChatListener.java
View file

@ -1,6 +1,7 @@
package com.lenis0012.bukkit.marriage2.listeners; package com.lenis0012.bukkit.marriage2.listeners;
import com.lenis0012.bukkit.marriage2.MPlayer; import com.lenis0012.bukkit.marriage2.MPlayer;
import com.lenis0012.bukkit.marriage2.config.Permissions;
import com.lenis0012.bukkit.marriage2.config.Settings; import com.lenis0012.bukkit.marriage2.config.Settings;
import com.lenis0012.bukkit.marriage2.internal.MarriageCore; import com.lenis0012.bukkit.marriage2.internal.MarriageCore;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -32,10 +33,12 @@ public class ChatListener implements Listener {
event.setCancelled(true); event.setCancelled(true);
String message = Settings.PM_FORMAT.value() String message = Settings.PM_FORMAT.value()
.replace("{name}", player.getDisplayName()) .replace("{name}", player.getDisplayName())
.replace("{message}", event.getMessage()) // .replace("{message}", event.getMessage())
.replace("{heart}", "\u2764"); .replace("{heart}", "\u2764");
message = formatIcons(message); message = formatIcons(message);
message = ChatColor.translateAlternateColorCodes('&', message); message = ChatColor.translateAlternateColorCodes('&', message);
final String msg = Permissions.CHAT_COLOR.has(player) ? ChatColor.translateAlternateColorCodes('&', event.getMessage()) : event.getMessage();
message = message.replace("{message}", msg);
Player partner = Bukkit.getPlayer(mp.getPartner().getUniqueId()); Player partner = Bukkit.getPlayer(mp.getPartner().getUniqueId());
player.sendMessage(message); player.sendMessage(message);