Bugfixes for private chat #131

Private chat toggle is no longer active when the player is not married Private chat target will be removed when a player gets divorced from the current target Private chat no longer sends commands as private chat messages on BungeeCord
GeorgH93 · Apr 19, 2020 · 0984d1c · 0984d1c
1 parent 573ffdd
commit 0984d1c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bungee/Commands/ChatCommand.java b/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Bungee/Commands/ChatCommand.java
@@ -195,7 +195,7 @@ public List<HelpData> getHelp(@NotNull CommandSender requester)
 	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onChat(ChatEvent event)
 	{
-		if(!(event.getSender() instanceof ProxiedPlayer)) return;
+		if(!(event.getSender() instanceof ProxiedPlayer) || event.isCommand()) return;
 		MarriagePlayer player = getMarriagePlugin().getPlayerData((ProxiedPlayer) event.getSender());
 		if(player.isPrivateChatDefault())
 		{

diff --git a/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Database/MarriagePlayerDataBase.java b/MarriageMaster/src/at/pcgamingfreaks/MarriageMaster/Database/MarriagePlayerDataBase.java
@@ -43,7 +43,7 @@ public abstract class MarriagePlayerDataBase<MARRIAGE_PLAYER extends MarriagePla
 	@Getter private boolean married = false;
 	@Getter @Setter	private Object databaseKey = null;
 	private MARRIAGE privateChatTarget = null;
-	private Map<MARRIAGE_PLAYER, MARRIAGE> partnersMarriages = new ConcurrentHashMap<>();
+	private final Map<MARRIAGE_PLAYER, MARRIAGE> partnersMarriages = new ConcurrentHashMap<>();
 
 	//region Constructor
 	protected MarriagePlayerDataBase(final @Nullable UUID uuid, final @NotNull String name)
@@ -100,6 +100,7 @@ public void removeMarriage(MARRIAGE marriage)
 	{
 		partnersMarriages.remove(marriage.getPartner(this));
 		married = partnersMarriages.size() > 0;
+		if(privateChatTarget.equals(marriage)) privateChatTarget = null;
 	}
 	//endregion
 
@@ -153,7 +154,7 @@ public void setPrivateChatDefault(boolean enable)
 	@Override
 	public boolean isPrivateChatDefault()
 	{
-		return privateChat;
+		return privateChat && isMarried();
 	}
 
 	@Override

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<revision>2.1.6-RC1</revision>
+		<revision>2.1.6</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>