limit depth of game_tick, just in case.
This commit is contained in:
1 parent
faa0c65af4
commit
d99ab4fc24
2 files changed
+26
-15
No files matched your search
@@ -51,6 +51,7 @@ public class CarpetScriptServer
|
|||||||
public Set<String> unloadableModules;
|
public Set<String> unloadableModules;
|
||||||
public long tickStart;
|
public long tickStart;
|
||||||
public boolean stopAll;
|
public boolean stopAll;
|
||||||
|
public int tickDepth;
|
||||||
private Set<String> holyMoly;
|
private Set<String> holyMoly;
|
||||||
public CarpetEventServer events;
|
public CarpetEventServer events;
|
||||||
|
|
||||||
|
|||||||
@@ -634,30 +634,40 @@ public class Auxiliary {
|
|||||||
|
|
||||||
|
|
||||||
expression.addLazyFunction("game_tick", -1, (c, t, lv) -> {
|
expression.addLazyFunction("game_tick", -1, (c, t, lv) -> {
|
||||||
ServerCommandSource s = ((CarpetContext)c).s;
|
CarpetContext cc = (CarpetContext)c;
|
||||||
|
ServerCommandSource s = cc.s;
|
||||||
if (!s.getMinecraftServer().isOnThread()) throw new InternalExpressionException("Unable to run ticks from threads");
|
if (!s.getMinecraftServer().isOnThread()) throw new InternalExpressionException("Unable to run ticks from threads");
|
||||||
((MinecraftServerInterface)s.getMinecraftServer()).forceTick( () -> System.nanoTime()- CarpetServer.scriptServer.tickStart<50000000L);
|
if (CarpetServer.scriptServer.tickDepth > 16) throw new InternalExpressionException("'game_tick' function caused other 'game_tick' functions to run. You should not allow that.");
|
||||||
if (lv.size()>0)
|
try
|
||||||
{
|
{
|
||||||
long ms_total = NumericValue.asNumber(lv.get(0).evalValue(c)).getLong();
|
CarpetServer.scriptServer.tickDepth ++;
|
||||||
long end_expected = CarpetServer.scriptServer.tickStart+ms_total*1000000L;
|
((MinecraftServerInterface) s.getMinecraftServer()).forceTick(() -> System.nanoTime() - CarpetServer.scriptServer.tickStart < 50000000L);
|
||||||
long wait = end_expected-System.nanoTime();
|
if (lv.size() > 0)
|
||||||
if (wait > 0L)
|
|
||||||
{
|
{
|
||||||
try
|
long ms_total = NumericValue.asNumber(lv.get(0).evalValue(c)).getLong();
|
||||||
{
|
long end_expected = CarpetServer.scriptServer.tickStart + ms_total * 1000000L;
|
||||||
Thread.sleep(wait/1000000L);
|
long wait = end_expected - System.nanoTime();
|
||||||
}
|
if (wait > 0L)
|
||||||
catch (InterruptedException ignored)
|
|
||||||
{
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Thread.sleep(wait / 1000000L);
|
||||||
|
}
|
||||||
|
catch (InterruptedException ignored)
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
CarpetServer.scriptServer.tickStart = System.nanoTime(); // for the next tick
|
||||||
|
Thread.yield();
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
CarpetServer.scriptServer.tickDepth --;
|
||||||
}
|
}
|
||||||
CarpetServer.scriptServer.tickStart = System.nanoTime(); // for the next tick
|
|
||||||
Thread.yield();
|
|
||||||
if(CarpetServer.scriptServer.stopAll)
|
if(CarpetServer.scriptServer.stopAll)
|
||||||
throw new ExitStatement(Value.NULL);
|
throw new ExitStatement(Value.NULL);
|
||||||
return (cc, tt) -> Value.TRUE;
|
return (_c, _t) -> Value.TRUE;
|
||||||
});
|
});
|
||||||
|
|
||||||
expression.addLazyFunction("seed", -1, (c, t, lv) -> {
|
expression.addLazyFunction("seed", -1, (c, t, lv) -> {
|
||||||
|
|||||||
Reference in new issue
Block a user