Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-26 02:28:03 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #194 from bm01/experimental

Browse Source 
Alert lone players trying to speak in party chat
This commit is contained in:
nossr50 2012-03-09 18:44:17 -08:00
commit 358c333c70
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gmail/nossr50/commands/party/PCommand.java
View File

@ -61,6 +61,11 @@ public class PCommand implements CommandExecutor {
// Not a toggle, a message // Not a toggle, a message
if (args.length >= 1) { if (args.length >= 1) {
if(!PP.inParty()) {
player.sendMessage("You're not in a party."); //TODO: Use mcLocale
return true;
}
String pMessage = args[0]; String pMessage = args[0];
for (int i = 1; i <= args.length - 1; i++) { for (int i = 1; i <= args.length - 1; i++) {
pMessage = pMessage + " " + args[i]; pMessage = pMessage + " " + args[i];

6
src/main/java/com/gmail/nossr50/listeners/mcPlayerListener.java
View File

@ -304,6 +304,12 @@ public class mcPlayerListener implements Listener
if(PP.getPartyChatMode()) if(PP.getPartyChatMode())
{ {
event.setCancelled(true); event.setCancelled(true);
if(!PP.inParty()) {
player.sendMessage("You're not in a party, type /p to leave party chat mode."); //TODO: Use mcLocale
return;
}
String name = (LoadProperties.pDisplayNames) ? player.getDisplayName() : player.getName(); String name = (LoadProperties.pDisplayNames) ? player.getDisplayName() : player.getName();
String format = ChatColor.GREEN + "(" + ChatColor.WHITE + name + ChatColor.GREEN + ") "+event.getMessage(); String format = ChatColor.GREEN + "(" + ChatColor.WHITE + name + ChatColor.GREEN + ") "+event.getMessage();
for(Player x : Bukkit.getServer().getOnlinePlayers()) for(Player x : Bukkit.getServer().getOnlinePlayers())