Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-23 10:35:12 +01:00
Code Issues Projects Releases Wiki Activity

Brackets.

Browse Source
This commit is contained in:
creeper123123321 2018-07-03 11:26:00 -03:00
parent 697e883649
commit 314af6d000
No known key found for this signature in database
GPG Key ID: 0AC57D54786721D1
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolPipeline.java
View File

@ -58,9 +58,11 @@ public class ProtocolPipeline extends Protocol {
protocol.init(userConnection);
// Move base Protocols to the end, so the login packets can be modified by other protocols
List<Protocol> toMove = new ArrayList<>();
for (Protocol p : protocolList)
if (ProtocolRegistry.isBaseProtocol(p))
for (Protocol p : protocolList) {
if (ProtocolRegistry.isBaseProtocol(p)) {
toMove.add(p);
}
}
protocolList.removeAll(toMove);
protocolList.addAll(toMove);
} else {

12
common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java
View File

@ -225,16 +225,20 @@ public class ProtocolRegistry {
}
public static Protocol getBaseProtocol(int serverVersion) {
for (Pair<Range<Integer>, Protocol> rangeProtocol : Lists.reverse(baseProtocols))
if (rangeProtocol.getKey().contains(serverVersion))
for (Pair<Range<Integer>, Protocol> rangeProtocol : Lists.reverse(baseProtocols)) {
if (rangeProtocol.getKey().contains(serverVersion)) {
return rangeProtocol.getValue();
}
}
throw new IllegalStateException("No Base Protocol for " + serverVersion);
}
public static boolean isBaseProtocol(Protocol protocol) {
for (Pair<Range<Integer>, Protocol> p : baseProtocols)
if (p.getValue() == protocol)
for (Pair<Range<Integer>, Protocol> p : baseProtocols) {
if (p.getValue() == protocol) {
return true;
}
}
return false;
}