Edit scoreboard teams so it works for 1.17, fixes #578
This commit is contained in:
		
							
								
								
									
										8
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								pom.xml
									
									
									
									
									
								
							@@ -97,7 +97,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        <asm.version>9.0</asm.version>
 | 
					        <asm.version>9.0</asm.version>
 | 
				
			||||||
        <lombok.version>1.18.16</lombok.version>
 | 
					        <lombok.version>1.18.16</lombok.version>
 | 
				
			||||||
        <protocollib.version>4.6.0</protocollib.version>
 | 
					        <protocollib.version>4.7.0-SNAPSHOT</protocollib.version>
 | 
				
			||||||
        <spigot.version>[1.17,]</spigot.version>
 | 
					        <spigot.version>[1.17,]</spigot.version>
 | 
				
			||||||
        <junit.version>4.13.1</junit.version>
 | 
					        <junit.version>4.13.1</junit.version>
 | 
				
			||||||
        <paper-api.version>[1.16,]</paper-api.version>
 | 
					        <paper-api.version>[1.16,]</paper-api.version>
 | 
				
			||||||
@@ -121,7 +121,7 @@
 | 
				
			|||||||
            <optional>true</optional>
 | 
					            <optional>true</optional>
 | 
				
			||||||
        </dependency>
 | 
					        </dependency>
 | 
				
			||||||
        <dependency>
 | 
					        <dependency>
 | 
				
			||||||
            <groupId>com.github.dmulloy2</groupId>
 | 
					            <groupId>com.comphenix.protocol</groupId>
 | 
				
			||||||
            <artifactId>ProtocolLib</artifactId>
 | 
					            <artifactId>ProtocolLib</artifactId>
 | 
				
			||||||
            <version>${protocollib.version}</version>
 | 
					            <version>${protocollib.version}</version>
 | 
				
			||||||
            <optional>true</optional>
 | 
					            <optional>true</optional>
 | 
				
			||||||
@@ -183,10 +183,6 @@
 | 
				
			|||||||
    </dependencies>
 | 
					    </dependencies>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <repositories>
 | 
					    <repositories>
 | 
				
			||||||
        <repository>
 | 
					 | 
				
			||||||
            <id>jitpack.io</id>
 | 
					 | 
				
			||||||
            <url>https://jitpack.io</url>
 | 
					 | 
				
			||||||
        </repository>
 | 
					 | 
				
			||||||
        <repository>
 | 
					        <repository>
 | 
				
			||||||
            <id>md_5-releases</id>
 | 
					            <id>md_5-releases</id>
 | 
				
			||||||
            <url>https://repo.md-5.net/content/groups/public/</url>
 | 
					            <url>https://repo.md-5.net/content/groups/public/</url>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,6 +8,7 @@ import com.comphenix.protocol.reflect.StructureModifier;
 | 
				
			|||||||
import com.comphenix.protocol.wrappers.WrappedChatComponent;
 | 
					import com.comphenix.protocol.wrappers.WrappedChatComponent;
 | 
				
			||||||
import me.libraryaddict.disguise.LibsDisguises;
 | 
					import me.libraryaddict.disguise.LibsDisguises;
 | 
				
			||||||
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 | 
					import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 | 
				
			||||||
 | 
					import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 | 
				
			||||||
import net.md_5.bungee.api.chat.BaseComponent;
 | 
					import net.md_5.bungee.api.chat.BaseComponent;
 | 
				
			||||||
import net.md_5.bungee.chat.ComponentSerializer;
 | 
					import net.md_5.bungee.chat.ComponentSerializer;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -34,7 +35,14 @@ public class PacketListenerScoreboardTeam extends PacketAdapter {
 | 
				
			|||||||
            return;
 | 
					            return;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        StructureModifier<WrappedChatComponent> chats = packet.getChatComponents();
 | 
					        StructureModifier<WrappedChatComponent> chats;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if (NmsVersion.v1_17.isSupported()) {
 | 
				
			||||||
 | 
					            // Might need to do sanity checks but eh
 | 
				
			||||||
 | 
					            chats = packet.getOptionalStructures().read(0).get().getChatComponents();
 | 
				
			||||||
 | 
					        } else {
 | 
				
			||||||
 | 
					            chats = packet.getChatComponents();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        BaseComponent[] prefix = DisguiseUtilities.getColoredChat(team.getPrefix());
 | 
					        BaseComponent[] prefix = DisguiseUtilities.getColoredChat(team.getPrefix());
 | 
				
			||||||
        BaseComponent[] suffix = DisguiseUtilities.getColoredChat(team.getSuffix());
 | 
					        BaseComponent[] suffix = DisguiseUtilities.getColoredChat(team.getSuffix());
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user