reider745/ZoteCoreLoader
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed: Исправлена ошибка в кэлбеках

Browse Source 
- Исправлено деление на 0 в команде tps
This commit is contained in:
Reider745
2024-07-30 09:42:42 +03:00
parent 295ed8e686
commit a45ccf8109
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/reider745/commands/TpsCommand.java
+12 -2
View File
@@ -17,11 +17,21 @@ public class TpsCommand extends Command {
long innerCoreSum = 0;
for(long time : innerCoreTimes)
innerCoreSum += Math.min(20, 1000 / time);
if(time != 0)
innerCoreSum += Math.min(20, 1000 / time);
else{
commandSender.sendMessage("Not enough information");
return true;
}
long nukkitSum = 0;
for(long time : nukkitTimes)
nukkitSum += Math.min(20, 1000 / time);
if(time != 0)
nukkitSum += Math.min(20, 1000 / time);
else{
commandSender.sendMessage("Not enough information");
return true;
}
if(innerCoreSum != 0 && nukkitSum != 0) {
commandSender.sendMessage("Inner core tps: " + (innerCoreSum / 20.0f));
src/main/java/com/zhekasmirnov/innercore/api/runtime/Callback.java
+14 -10
View File
@@ -66,9 +66,11 @@ public class Callback {
Scriptable parent;
if (funcs != null) {
long profilingNanos = !profilingEnabled || isTick ? 0 : System.nanoTime();
for (CallbackFunction callback : funcs) {
parent = callback.function.getParentScope();
callback.function.call(ctx, parent, parent, params);
synchronized (funcs) {
for (CallbackFunction callback : funcs) {
parent = callback.function.getParentScope();
callback.function.call(ctx, parent, parent, params);
}
}
if (profilingNanos != 0) {
profilingNanos = System.nanoTime() - profilingNanos;
@@ -96,13 +98,15 @@ public class Callback {
if (profilingEnabled && !isTick) {
result.add(() -> profilingNanos.set(System.nanoTime()));
}
for (CallbackFunction func0 : funcs) {
result.add(new Runnable() {
public void run() {
Scriptable parent = func0.function.getParentScope();
func0.function.call(Compiler.assureContextForCurrentThread(), parent, parent, params);
}
});
synchronized (funcs) {
for (CallbackFunction func0 : funcs) {
result.add(new Runnable() {
public void run() {
Scriptable parent = func0.function.getParentScope();
func0.function.call(Compiler.assureContextForCurrentThread(), parent, parent, params);
}
});
}
}
if (profilingNanos.get() != 0) {
result.add(() -> Logger.debug("Profiling/" + name, funcs.size() + " functions in "