Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translation Updates and Sonar Fixes #1177

Merged
merged 5 commits into from Jul 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/main/java/cn/nukkit/level/Level.java
Expand Up @@ -54,10 +54,8 @@
import cn.nukkit.scheduler.BlockUpdateScheduler;
import cn.nukkit.timings.LevelTimings;
import cn.nukkit.utils.*;
import co.aikar.timings.Timing;
import co.aikar.timings.Timings;
import co.aikar.timings.TimingsHistory;
import co.aikar.timings.TimingsManager;
import com.google.common.base.Preconditions;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
Expand Down Expand Up @@ -91,7 +89,7 @@ public class Level implements ChunkManager, Metadatable {
public static final Level[] EMPTY_ARRAY = new Level[0];

static {
Timings.isTimingsEnabled(); // Fixes Concurrency issues on static initialization
Timings.init();
}

private static int levelIdCounter = 1;
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/cn/nukkit/utils/BinaryStream.java
Expand Up @@ -26,6 +26,7 @@
import io.netty.buffer.ByteBufAllocator;
import io.netty.util.internal.EmptyArrays;
import lombok.SneakyThrows;
import lombok.val;

import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand Down Expand Up @@ -725,8 +726,8 @@ public void putVector3f(float x, float y, float z) {
}

public void putGameRules(GameRules gameRules) {
Map<GameRule, GameRules.Value> rules = gameRules.getGameRules();
this.putUnsignedVarInt(rules.size() - 1);
val rules = gameRules.getGameRules();
this.putUnsignedVarInt(rules.size() - 1L);
rules.forEach((gameRule, value) -> {
//noinspection deprecation
if (gameRule == GameRule.SHOW_DEATH_MESSAGE) {
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/co/aikar/timings/Timings.java
Expand Up @@ -24,6 +24,8 @@
package co.aikar.timings;

import cn.nukkit.Server;
import cn.nukkit.api.PowerNukkitOnly;
import cn.nukkit.api.Since;
import cn.nukkit.blockentity.BlockEntity;
import cn.nukkit.command.Command;
import cn.nukkit.entity.Entity;
Expand Down Expand Up @@ -133,6 +135,15 @@ public final class Timings {
permissionDefaultTimer = TimingsManager.getTiming("Default Permission Calculation");
}

/**
* Initialize the static fields.
*/
@PowerNukkitOnly
@Since("FUTURE")
public static void init() {
// code is already executed on <cinit>
}

public static boolean isTimingsEnabled() {
return timingsEnabled;
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/cn/nukkit/level/LevelTest.java
Expand Up @@ -57,7 +57,7 @@ void setUp() throws IOException {
levelFolder = new File(server.getDataPath(), "worlds/TestLevel");
String path = levelFolder.getAbsolutePath()+File.separator;
Anvil.generate(path, "TestLevel", 0, Flat.class);
Timings.isTimingsEnabled(); // Initialize timings to avoid concurrent updates on initialization
Timings.init();
level = new Level(server, "TestLevel", path, Anvil.class);
level.setAutoSave(true);

Expand Down