Skip to content

Commit c044eac

Browse files
Merge pull request #140 from kyngs/protocol_versioning
Fix another protocol issues on Velocity
2 parents 35abb56 + dfcbc9d commit c044eac

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

protocolize-velocity/src/main/java/dev/simplix/protocolize/velocity/providers/VelocityProtocolRegistrationProvider.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,14 @@ public void registerPacket(List<ProtocolIdMapping> mappings, Protocol protocol,
8181
Class<? extends MinecraftPacket> velocityPacket = generateVelocityPacket(packetClass);
8282
List<StateRegistry.PacketMapping> velocityMappings = new ArrayList<>();
8383

84-
var sortedMappings = mappings.stream().sorted(Comparator.comparingInt(ProtocolMapping::protocolRangeEnd)).toArray(ProtocolIdMapping[]::new);
84+
var sortedMappings = mappings.stream()
85+
.filter(mapping -> !(ProtocolVersion.MAXIMUM_VERSION.getProtocol() < mapping.protocolRangeStart() || ProtocolVersion.MAXIMUM_VERSION.getProtocol() < mapping.protocolRangeEnd()))
86+
.sorted(Comparator.comparingInt(ProtocolMapping::protocolRangeEnd))
87+
.toArray(ProtocolIdMapping[]::new);
8588

8689
for (int i = 0; i < sortedMappings.length; i++) {
8790
var mapping = sortedMappings[i];
8891
mappingProvider.registerMapping(new RegisteredPacket(direction, packetClass), mapping);
89-
if (ProtocolVersion.MAXIMUM_VERSION.getProtocol() < mapping.protocolRangeStart() || ProtocolVersion.MAXIMUM_VERSION.getProtocol() < mapping.protocolRangeEnd()) continue;
9092
velocityMappings.add(createVelocityMapping(mapping.protocolRangeStart(), mapping.protocolRangeEnd(), mapping.id(), i == sortedMappings.length - 1));
9193
}
9294
try {

0 commit comments

Comments
 (0)