소스 검색

avoid null party names

nossr50 5 년 전
부모
커밋
4e8f49db5b
2개의 변경된 파일3개의 추가작업 그리고 37개의 파일을 삭제
  1. 1 1
      Changelog.txt
  2. 2 36
      src/main/java/com/gmail/nossr50/datatypes/party/Party.java

+ 1 - 1
Changelog.txt

@@ -1,9 +1,9 @@
 Version 2.1.151
-    Fixed a bug where players could use the party chat command without the party chat permission
     Added new config 'chat.yml'
     Added 'Chat.Channels.Party.Spies.Automatically_Enable_Spying' to chat.yml which when enabled will start users who have the chat spy permission in chat spying mode
     All chat settings that used to be in 'config.yml' are now in 'chat.yml'
     The list of party members shown when using the party command has been simplified, this will change again in the T&C update
+    Fixed a bug where players could use the party chat command without the party chat permission
 
     NOTES:
     I greatly disliked the old party member list but was avoiding rewriting it until later, someone pointed out how ugly it was and my OCD triggered and now it is rewritten. I will rewrite it again in T&C.

+ 2 - 36
src/main/java/com/gmail/nossr50/datatypes/party/Party.java

@@ -1,11 +1,8 @@
 package com.gmail.nossr50.datatypes.party;
 
-import com.gmail.nossr50.chat.ChatManager;
 import com.gmail.nossr50.chat.SamePartyPredicate;
-import com.gmail.nossr50.config.ChatConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.datatypes.chat.ChatChannel;
 import com.gmail.nossr50.datatypes.experience.FormulaType;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -13,7 +10,6 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.party.PartyManager;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
 import org.bukkit.Bukkit;
@@ -29,12 +25,6 @@ import java.util.function.Predicate;
 
 public class Party {
     private final @NotNull Predicate<CommandSender> samePartyPredicate;
-//    private static final String ONLINE_PLAYER_PREFIX = "★";
-//    private static final String ONLINE_PLAYER_PREFIX = "●" + ChatColor.RESET;
-    private static final String ONLINE_PLAYER_PREFIX = "⬤";
-//    private static final String OFFLINE_PLAYER_PREFIX = "☆";
-    private static final String OFFLINE_PLAYER_PREFIX = "○";
-//    private static final String OFFLINE_PLAYER_PREFIX = "⭕" + ChatColor.RESET;
     private final LinkedHashMap<UUID, String> members = new LinkedHashMap<>();
     private final List<Player> onlineMembers = new ArrayList<>();
 
@@ -355,10 +345,11 @@ public class Party {
 
         for(UUID playerUUID : members.keySet()) {
             OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerUUID);
+
             if(offlinePlayer.isOnline() && player.canSee((Player) offlinePlayer)) {
                 coloredNames.add(ChatColor.GREEN + offlinePlayer.getName());
             } else {
-                coloredNames.add(ChatColor.DARK_GRAY + offlinePlayer.getName());
+                coloredNames.add(ChatColor.DARK_GRAY + members.get(playerUUID));
             }
         }
 
@@ -379,31 +370,6 @@ public class Party {
         }
     }
 
-    private boolean isNotSamePerson(UUID onlinePlayerUUID, UUID uniqueId) {
-        return onlinePlayerUUID != uniqueId;
-    }
-
-    private void applyOnlineAndRangeFormatting(StringBuilder stringBuilder, boolean isVisibleOrOnline, boolean isNear)
-    {
-        if(isVisibleOrOnline)
-        {
-            if(isNear)
-            {
-                stringBuilder.append(ChatColor.GREEN);
-            } else {
-                stringBuilder.append(ChatColor.GRAY);
-            }
-
-//            stringBuilder.append(ChatColor.BOLD);
-            stringBuilder.append(ONLINE_PLAYER_PREFIX);
-        } else {
-            stringBuilder.append(ChatColor.GRAY);
-            stringBuilder.append(OFFLINE_PLAYER_PREFIX);
-        }
-
-        stringBuilder.append(ChatColor.RESET);
-    }
-
     /**
      * Get the near party members.
      *