From c040a8865ffb7e204919da9a62bb521b5b46ad61 Mon Sep 17 00:00:00 2001 From: Ben Staddon Date: Thu, 15 Nov 2018 21:52:45 +0000 Subject: [PATCH] Fix some null returns from defaulted registries (#5235) --- src/main/java/net/minecraftforge/registries/ForgeRegistry.java | 3 ++- .../minecraftforge/registries/NamespacedDefaultedWrapper.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/registries/ForgeRegistry.java b/src/main/java/net/minecraftforge/registries/ForgeRegistry.java index 2236347281..37ead12aa5 100644 --- a/src/main/java/net/minecraftforge/registries/ForgeRegistry.java +++ b/src/main/java/net/minecraftforge/registries/ForgeRegistry.java @@ -190,7 +190,8 @@ public class ForgeRegistry> implements IForgeRe @Override public ResourceLocation getKey(V value) { - return this.names.inverse().get(value); + ResourceLocation ret = this.names.inverse().get(value); + return ret == null ? this.defaultKey : ret; } @Override diff --git a/src/main/java/net/minecraftforge/registries/NamespacedDefaultedWrapper.java b/src/main/java/net/minecraftforge/registries/NamespacedDefaultedWrapper.java index 44dfcffe21..b80566a0d3 100644 --- a/src/main/java/net/minecraftforge/registries/NamespacedDefaultedWrapper.java +++ b/src/main/java/net/minecraftforge/registries/NamespacedDefaultedWrapper.java @@ -125,7 +125,7 @@ class NamespacedDefaultedWrapper> extends Regis public V getRandomObject(Random random) { Collection values = this.delegate.getValuesCollection(); - return values.stream().skip(random.nextInt(values.size())).findFirst().orElse(null); + return values.stream().skip(random.nextInt(values.size())).findFirst().orElse(this.delegate.getDefault()); } //internal