Merge branch 'post_release_teaks' of https://github.com/gnembon/fabric-carpet into post_release_teaks
This commit is contained in:
commit
e4a035149a
3 files changed
+5
-2
No files matched your search
@@ -234,7 +234,7 @@ public class CarpetEventServer
|
|||||||
private ScheduledCall makeEventCall(CarpetContext cc, String function, List<Value> extraArgs, int argCount)
|
private ScheduledCall makeEventCall(CarpetContext cc, String function, List<Value> extraArgs, int argCount)
|
||||||
{
|
{
|
||||||
UserDefinedFunction udf = cc.host.globalFunctions.get(function);
|
UserDefinedFunction udf = cc.host.globalFunctions.get(function);
|
||||||
if (udf == null || udf.getArguments().size() != argCount)
|
if (udf == null || (udf.getArguments().size()-extraArgs.size()) != argCount)
|
||||||
{
|
{
|
||||||
// call won't match arguments
|
// call won't match arguments
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import static carpet.settings.RuleCategory.SURVIVAL;
|
|||||||
|
|
||||||
public class CarpetSettings
|
public class CarpetSettings
|
||||||
{
|
{
|
||||||
public static final String carpetVersion = "1.0.0-v190721";
|
public static final String carpetVersion = "1.0.1-v190726";
|
||||||
public static final Logger LOG = LogManager.getLogger();
|
public static final Logger LOG = LogManager.getLogger();
|
||||||
public static boolean skipGenerationChecks = false;
|
public static boolean skipGenerationChecks = false;
|
||||||
public static boolean impendingFillSkipUpdates = false;
|
public static boolean impendingFillSkipUpdates = false;
|
||||||
|
|||||||
@@ -114,6 +114,9 @@
|
|||||||
"PickaxeItem_missingToolsMixin",
|
"PickaxeItem_missingToolsMixin",
|
||||||
"ShearsItem_missingToolsMixin",
|
"ShearsItem_missingToolsMixin",
|
||||||
|
|
||||||
|
"Entity_scarpetEventsMixin",
|
||||||
|
"LivingEntity_scarpetEventsMixin",
|
||||||
|
|
||||||
|
|
||||||
"PistonBlock_movableTEMixin",
|
"PistonBlock_movableTEMixin",
|
||||||
"PistonBlockEntity_movableTEMixin",
|
"PistonBlockEntity_movableTEMixin",
|
||||||
|
|||||||
Reference in new issue
Block a user