diff --git a/.classpath b/.classpath index 1ad331c..e21dd31 100644 --- a/.classpath +++ b/.classpath @@ -20,5 +20,6 @@ + diff --git a/MineverseChat/bungee.yml b/MineverseChat/bungee.yml index 512d680..000374c 100644 --- a/MineverseChat/bungee.yml +++ b/MineverseChat/bungee.yml @@ -1,4 +1,4 @@ name: VentureChat main: mineverse.Aust1n46.chat.bungee.MineverseChatBungee -version: 2.16.0 +version: 2.17.0 author: Aust1n46 \ No newline at end of file diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java index b47d57b..6b33a37 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java +++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java @@ -587,10 +587,10 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { System.out.println(m.getName()); } } - if(VersionHandler.is1_14_4()) { - ArrayList list = (ArrayList) c.getMethod("getSiblings").invoke(o, new Object[0]); + if(VersionHandler.is1_7() || VersionHandler.is1_8() || VersionHandler.is1_9() || VersionHandler.is1_10() || VersionHandler.is1_11() || VersionHandler.is1_12() || VersionHandler.is1_13() || (VersionHandler.is1_14() && !VersionHandler.is1_14_4())) { + ArrayList list = (ArrayList) c.getMethod("a").invoke(o, new Object[0]); for(Object component : list) { - ArrayList innerList = (ArrayList) c.getMethod("getSiblings").invoke(component, new Object[0]); + ArrayList innerList = (ArrayList) c.getMethod("a").invoke(component, new Object[0]); if(innerList.size() > 0) { splitComponents(finalList, component, c); } @@ -600,9 +600,9 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener { } } else { - ArrayList list = (ArrayList) c.getMethod("a").invoke(o, new Object[0]); + ArrayList list = (ArrayList) c.getMethod("getSiblings").invoke(o, new Object[0]); for(Object component : list) { - ArrayList innerList = (ArrayList) c.getMethod("a").invoke(component, new Object[0]); + ArrayList innerList = (ArrayList) c.getMethod("getSiblings").invoke(component, new Object[0]); if(innerList.size() > 0) { splitComponents(finalList, component, c); } diff --git a/MineverseChat/mineverse/Aust1n46/chat/versions/VersionHandler.java b/MineverseChat/mineverse/Aust1n46/chat/versions/VersionHandler.java index 6b65f57..37eb197 100644 --- a/MineverseChat/mineverse/Aust1n46/chat/versions/VersionHandler.java +++ b/MineverseChat/mineverse/Aust1n46/chat/versions/VersionHandler.java @@ -77,6 +77,10 @@ public class VersionHandler { return Bukkit.getVersion().contains("1.14.4"); } + public static boolean is1_15() { + return Bukkit.getVersion().contains("1.15"); + } + public static boolean isCauldron() { return false; } diff --git a/MineverseChat/plugin.yml b/MineverseChat/plugin.yml index b26ab77..79bedf5 100644 --- a/MineverseChat/plugin.yml +++ b/MineverseChat/plugin.yml @@ -1,5 +1,5 @@ name: VentureChat -version: 2.16.0 +version: 2.17.0 api-version: 1.13 main: mineverse.Aust1n46.chat.MineverseChat depend: [Vault, ProtocolLib, PlaceholderAPI]