2.5.1 Update

LOOHP · Jul 4, 2020 · dfacbbf · dfacbbf
1 parent 3c9dad3
commit dfacbbf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/com/loohp/interactivechat/Listeners/ChatPackets.java b/src/com/loohp/interactivechat/Listeners/ChatPackets.java
@@ -162,6 +162,7 @@ public void onPacketSending(PacketEvent event) {
 		        	longerThanMaxLength = true;
 		        }
 		        debug++;
+		        //Bukkit.getConsoleSender().sendMessage(ComponentSerializer.toString(basecomponent));
 		        if (field == 0) {
 		        	packet.getChatComponents().write(0, WrappedChatComponent.fromJson(json));
 		        } else {

diff --git a/src/com/loohp/interactivechat/Utils/ChatColorUtils.java b/src/com/loohp/interactivechat/Utils/ChatColorUtils.java
@@ -87,7 +87,7 @@ public static String getFirstColors(String input) {
         		break;
         	}
         	i++;
-        }
+        }              
 
         return result;
     }

diff --git a/src/com/loohp/interactivechat/Utils/ChatComponentUtils.java b/src/com/loohp/interactivechat/Utils/ChatComponentUtils.java
@@ -17,6 +17,7 @@
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ClickEvent;
+import net.md_5.bungee.api.chat.ComponentBuilder.FormatRetention;
 import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.HoverEvent.Content;
 import net.md_5.bungee.api.chat.HoverEvent.ContentEntity;
@@ -265,10 +266,11 @@ public static BaseComponent cleanUpLegacyText(BaseComponent basecomponent, Playe
 				List<TextComponent> texts = Arrays.asList(TextComponent.fromLegacyText(base.toLegacyText())).stream().map(each -> (TextComponent) each).collect(Collectors.toList());
 				texts.forEach(each -> {
 					if (InteractiveChat.version.isLegacy() && !InteractiveChat.version.equals(MCVersion.V1_12)) {
-						each = (TextComponent) CustomStringUtils.copyFormattingNoReplace(each, base);
+						each = (TextComponent) CustomStringUtils.copyFormattingEventsNoReplace(each, base);
 	 	        	} else {
-	 	        		each.copyFormatting(base, false);
+	 	        		each.copyFormatting(base, FormatRetention.EVENTS, false);
 	 	        	}
+					//Bukkit.getConsoleSender().sendMessage(ComponentSerializer.toString(each).replace("§", "&"));
 				});
 				newlist.addAll(texts);
 			} else {

diff --git a/src/plugin.yml b/src/plugin.yml
@@ -1,6 +1,6 @@
 name: InteractiveChat
 author: loohp
-version: 2.5.0
+version: 2.5.1
 main: com.loohp.interactivechat.InteractiveChat
 api-version: 1.13
 description: Make the chat interactive
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,7 +87,7 @@ public static String getFirstColors(String input) { @@
             		break;
             	}
             	i++;
-            }
+            }
             return result;
         }
@@ Expand Down @@