icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.15

Browse Source 
# Conflicts:
#	src/main/java/carpet/commands/ScriptCommand.java
#	src/main/java/carpet/helpers/EntityPlayerActionPack.java
This commit is contained in:
gnembon committed 2020-01-05 02:27:33 -04:00
2 parents eee3a91890 1650f3233b
commit 8725b59241
16 files changed
+352 -245
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/CarpetExpression.java
+4 -4
View File
@@ -3378,11 +3378,11 @@ public class CarpetExpression
}
catch (ExpressionException e)
{
throw new CarpetExpressionException(e.getMessage());
throw new CarpetExpressionException(e.getMessage(), e.stack);
}
catch (ArithmeticException ae)
{
throw new CarpetExpressionException("Math doesn't compute... "+ae.getMessage());
throw new CarpetExpressionException("Math doesn't compute... "+ae.getMessage(), null);
}
}
@@ -3425,11 +3425,11 @@ public class CarpetExpression
}
catch (ExpressionException e)
{
throw new CarpetExpressionException(e.getMessage());
throw new CarpetExpressionException(e.getMessage(), e.stack);
}
catch (ArithmeticException ae)
{
throw new CarpetExpressionException("Math doesn't compute... "+ae.getMessage());
throw new CarpetExpressionException("Math doesn't compute... "+ae.getMessage(), null);
}
}