option to disable nick/skin disguise

InventivetalentDev · Mar 27, 2021 · 6e53aec · 6e53aec
1 parent 219bac3
commit 6e53aec
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/API/src/main/java/org/inventivetalent/nicknamer/api/PacketListener.java b/API/src/main/java/org/inventivetalent/nicknamer/api/PacketListener.java
@@ -311,7 +311,7 @@ private GameProfileWrapper disguiseProfile(final Player observer, final GameProf
         final OfflinePlayer toDisguise = Bukkit.getOfflinePlayer(id);
 
         if (toDisguise == null /*|| !toDisguise.isOnline()*/) {
-            return profileWrapper;//Player to disguise doesn't exist
+            return null;//Player to disguise doesn't exist
         }
 
         boolean async = !getPlugin().getServer().isPrimaryThread();

diff --git a/Plugin/src/main/java/org/inventivetalent/nicknamer/NickNamerPlugin.java b/Plugin/src/main/java/org/inventivetalent/nicknamer/NickNamerPlugin.java
@@ -107,6 +107,9 @@ public class NickNamerPlugin extends JavaPlugin implements Listener, PluginMessa
 	final Executor storageExecutor = Executors.newSingleThreadExecutor();
 
 	//	@ConfigValue(path = "replace.tab") boolean replaceTab;
+	@ConfigValue(path = "disguise.nick", defaultsTo = "true") boolean disguiseNick;
+	@ConfigValue(path = "disguise.skin", defaultsTo = "true") boolean disguiseSkin;
+
 	@ConfigValue(path = "replace.chat.player")            boolean replaceChatPlayer;
 	@ConfigValue(path = "replace.chat.out")               boolean replaceChatOut;
 	@ConfigValue(path = "replace.chat.in.general")        boolean replaceChatInGeneral;
@@ -461,6 +464,10 @@ void parseListOrCategories(String path, Map<String, Collection<String>> target)
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void on(final NickDisguiseEvent event) {
 		if (event.isCancelled()) { return; }
+		if (!disguiseNick) {
+			event.setCancelled(true);
+			return;
+		}
 		if (getAPI().isNicked(event.getDisguised().getUniqueId())) {
 			event.setNick(getAPI().getNick(event.getDisguised().getUniqueId()));
 
@@ -480,6 +487,10 @@ public void provide(@Nullable String nick) {
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void on(final SkinDisguiseEvent event) {
 		if (event.isCancelled()) { return; }
+		if (!disguiseSkin) {
+			event.setCancelled(true);
+			return;
+		}
 		if (getAPI().hasSkin(event.getDisguised().getUniqueId())) {
 			event.setSkin(getAPI().getSkin(event.getDisguised().getUniqueId()));
 

diff --git a/Plugin/src/main/resources/config.yml b/Plugin/src/main/resources/config.yml
@@ -1,3 +1,7 @@
+disguise:
+  # Disguise nick & skin; disable both to prevent GameProfile packets from being modified
+  nick: true
+  skin: true
 replace:
   chat:
     # Replace names in messages sent by players