PaperMC/paper-server/nms-patches/net/minecraft/stats/ServerStatisticManager.patch
CraftBukkit/Spigot 43702a9e10 Update to Minecraft 1.18-pre5
By: md_5 <git@md-5.net>
2021-11-22 09:00:00 +11:00

26 lines
1.1 KiB
Diff

--- a/net/minecraft/stats/ServerStatisticManager.java
+++ b/net/minecraft/stats/ServerStatisticManager.java
@@ -1,3 +1,4 @@
+// mc-dev import
package net.minecraft.stats;
import com.google.common.collect.Maps;
@@ -161,13 +162,12 @@
}
private <T> Optional<Statistic<T>> getStat(StatisticWrapper<T> statisticwrapper, String s) {
- Optional optional = Optional.ofNullable(MinecraftKey.tryParse(s));
- IRegistry iregistry = statisticwrapper.getRegistry();
+ // CraftBukkit - decompile error start
+ Optional<MinecraftKey> optional = Optional.ofNullable(MinecraftKey.tryParse(s));
+ IRegistry<T> iregistry = statisticwrapper.getRegistry();
- Objects.requireNonNull(iregistry);
- optional = optional.flatMap(iregistry::getOptional);
- Objects.requireNonNull(statisticwrapper);
- return optional.map(statisticwrapper::get);
+ return optional.flatMap(iregistry::getOptional).map(statisticwrapper::get);
+ // CraftBukkit - decompile error end
}
private static NBTTagCompound fromJson(JsonObject jsonobject) {