From 231dfeee31182993d9f8b9aa023025fd7ac5834c Mon Sep 17 00:00:00 2001 From: tterrag Date: Sun, 16 Sep 2018 16:59:08 -0400 Subject: [PATCH] Enforce bounds on min/max registry IDs --- .../net/minecraftforge/registries/RegistryBuilder.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/registries/RegistryBuilder.java b/src/main/java/net/minecraftforge/registries/RegistryBuilder.java index 7014486192..315721337a 100644 --- a/src/main/java/net/minecraftforge/registries/RegistryBuilder.java +++ b/src/main/java/net/minecraftforge/registries/RegistryBuilder.java @@ -30,11 +30,13 @@ import javax.annotation.Nullable; public class RegistryBuilder> { + private static final int MAX_ID = Integer.MAX_VALUE - 1; + private ResourceLocation registryName; private Class registryType; private ResourceLocation optionalDefaultKey; private int minId = 0; - private int maxId = Integer.MAX_VALUE - 1; + private int maxId = MAX_ID; private List> addCallback = Lists.newArrayList(); private List> clearCallback = Lists.newArrayList(); private List> createCallback = Lists.newArrayList(); @@ -59,8 +61,8 @@ public class RegistryBuilder> public RegistryBuilder setIDRange(int min, int max) { - this.minId = min; - this.maxId = max; + this.minId = Math.max(min, 0); + this.maxId = Math.min(max, MAX_ID); return this; }