Merge branch 'master' into 1.17
This commit is contained in:
commit
cc697d159a
3 files changed
+11
-3
No files matched your search
@@ -42,7 +42,7 @@ import static carpet.settings.RuleCategory.CLIENT;
|
||||
@SuppressWarnings("CanBeFinal")
|
||||
public class CarpetSettings
|
||||
{
|
||||
public static final String carpetVersion = "1.4.25+v210203";
|
||||
public static final String carpetVersion = "1.4.26+v210210";
|
||||
public static final Logger LOG = LogManager.getLogger("carpet");
|
||||
public static boolean skipGenerationChecks = false;
|
||||
public static boolean impendingFillSkipUpdates = false;
|
||||
|
||||
@@ -205,7 +205,15 @@ public class CarpetEventServer
|
||||
if (callList.size() > 0)
|
||||
{
|
||||
List<Value> argv = argumentSupplier.get(); // empty for onTickDone
|
||||
ServerCommandSource source = cmdSourceSupplier.get();
|
||||
ServerCommandSource source;
|
||||
try
|
||||
{
|
||||
source = cmdSourceSupplier.get();
|
||||
}
|
||||
catch (NullPointerException noReference) // todo figure out what happens when closing.
|
||||
{
|
||||
return;
|
||||
}
|
||||
String nameCheck = perPlayerDistribution?source.getName():null;
|
||||
assert argv.size() == reqArgs;
|
||||
List<Callback> fails = new ArrayList<>();
|
||||
|
||||
Reference in new issue
Block a user