Fix BuildCraft#4342.

joschock · Jan 28, 2019 · ed00d29 · ed00d29
1 parent 5274951
commit ed00d29
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/buildcraft_resources/changelog/7.99.22 b/buildcraft_resources/changelog/7.99.22
@@ -5,3 +5,4 @@ Bug fixes:
 * [#4325] Fixed the guide book's contents page not going back to the previous page when searching over the page count.
 * [#4328] Fix the guide always reloading all data twice, rather than once.
 * [#4331] Fixed the config option "useSwappableSprites" not being respected for fluid sprites.
+* [#4342] Fixed a crash when setting the oil well heights in the config to invalid values (such as small_max_height=10 and small_min_height=14)
diff --git a/common/buildcraft/energy/generation/OilGenerator.java b/common/buildcraft/energy/generation/OilGenerator.java
@@ -171,8 +171,17 @@ public static List<OilGenStructure> getStructures(World world, int cx, int cz) {
                     maxHeight = BCEnergyConfig.smallSpoutMaxHeight;
                     radius = 0;
                 }
-
-                int height = minHeight + rand.nextInt(maxHeight - minHeight);
+                final int height;
+                if (maxHeight == minHeight) {
+                    height = maxHeight;
+                } else {
+                    if (maxHeight < minHeight) {
+                        int t = maxHeight;
+                        maxHeight = minHeight;
+                        minHeight = t;
+                    }
+                    height = minHeight + rand.nextInt(maxHeight - minHeight);
+                }
                 structures.add(createSpout(new BlockPos(x, wellY, z), height, radius));
             }