aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--src/Java/gtPlusPlus/core/block/general/HellFire.java6
2 files changed, 7 insertions, 1 deletions
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 678d9d8de3..0e828e2b7e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
diff --git a/src/Java/gtPlusPlus/core/block/general/HellFire.java b/src/Java/gtPlusPlus/core/block/general/HellFire.java
index fb9078d47a..96738c492f 100644
--- a/src/Java/gtPlusPlus/core/block/general/HellFire.java
+++ b/src/Java/gtPlusPlus/core/block/general/HellFire.java
@@ -445,16 +445,22 @@ public class HellFire extends BlockFire {
@Override
public void setFireInfo(final Block block, final int encouragement, final int flammibility) {
+ try {
if (block == Blocks.air) {
throw new IllegalArgumentException("Tried to set air on fire... This is bad.");
}
final int id = Block.getIdFromBlock(block);
+ if (id >= 4096) {
+ return;
+ }
this.field_149849_a[id] = encouragement;
this.field_149848_b[id] = flammibility;
final FireInfo info = this.getInfo(block, true);
info.encouragement = encouragement;
info.flammibility = flammibility;
+ }
+ catch (Throwable t) {}
}
private FireInfo getInfo(final Block block, final boolean garentee) {