Upstream
/
ProtocolLib
mirror of https://github.com/dmulloy2/ProtocolLib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 1661-Modifier_for_Either_and_SignatureData_in_PacketLoginInEncryptionBegin

This commit is contained in:
Dan Mulloy 2022-07-26 13:20:50 -04:00 committed by GitHub
parent 9838d6d1cc c3dc00de05
commit 284198358c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/comphenix/protocol/utility/CachedPackage.java
View File

@ -15,9 +15,9 @@
*/
package com.comphenix.protocol.utility;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
/**
* Represents a dynamic package and an arbitrary number of cached classes.
@ -39,7 +39,7 @@ final class CachedPackage {
public CachedPackage(String packageName, ClassSource source) {
this.source = source;
this.packageName = packageName;
this.cache = new HashMap<>();
this.cache = new ConcurrentHashMap<>();
}
/**

2
src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java
View File

@ -55,7 +55,7 @@ public final class MinecraftReflection {
/**
* Regular expression that matches a canonical Java class.
*/
private static final String CANONICAL_REGEX = "\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*";
private static final String CANONICAL_REGEX = "(\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*\\.)+\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*";
private static final String MINECRAFT_CLASS_NAME_REGEX = "net\\.minecraft\\." + CANONICAL_REGEX;
/**