mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

MC Dev fixes

Browse source
This commit is contained in:
Aikar 2016-03-30 19:36:20 -04:00
parent 769119f918
commit f829dcd46a
10 changed files with 108 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
paper-server/patches/sources/net/minecraft/resources/RegistryDataLoader.java.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/net/minecraft/resources/RegistryDataLoader.java
+++ b/net/minecraft/resources/RegistryDataLoader.java
@@ -74,7 +74,7 @@
public class RegistryDataLoader {
private static final Logger LOGGER = LogUtils.getLogger();
- private static final Comparator<ResourceKey<?>> ERROR_KEY_COMPARATOR = Comparator.comparing(ResourceKey::registry).thenComparing(ResourceKey::location);
+ private static final Comparator<ResourceKey<?>> ERROR_KEY_COMPARATOR = Comparator.<ResourceKey<?>, ResourceLocation>comparing(ResourceKey::registry).thenComparing(ResourceKey::location); // Paper - decompile fix
private static final RegistrationInfo NETWORK_REGISTRATION_INFO = new RegistrationInfo(Optional.empty(), Lifecycle.experimental());
private static final Function<Optional<KnownPack>, RegistrationInfo> REGISTRATION_INFO_CACHE = Util.memoize(knownPacks -> {
Lifecycle lifecycle = knownPacks.map(KnownPack::isVanilla).map(vanilla -> Lifecycle.stable()).orElse(Lifecycle.experimental());