Fixed: BlockSource null

This commit is contained in:
Reider745
2024-03-27 17:49:37 +03:00
parent f262310af9
commit 7a2a8f6667
3 changed files with 8 additions and 7 deletions
@@ -212,6 +212,7 @@ public class InnerCoreServer {
CallbackHelper.init();
NukkitIdConvertor.init();
DimensionsMethods.init();
FakeDimensions.init();
HashMap<String, Object> description = new HashMap<>();
description.put("name", "ZoteCore");
@@ -302,7 +303,6 @@ public class InnerCoreServer {
pluginManager.registerEvents(new SnowfallEverywhere(), plugin);
}
FakeDimensions.init();
DimensionsFix.init();
GlobalBlockPalette.init();
RuntimeItemsHooks.register();
@@ -40,8 +40,6 @@ public class BlockSourceMethods {
}
public static Level getLevelForDimension(int dimension) {
/*return */
//FakeDimensions.getFakeIdForLevel()
return FakeDimensions.getLevelForFakeId(dimension);
}
@@ -2,6 +2,7 @@ package com.reider745.world;
import cn.nukkit.Server;
import cn.nukkit.level.Level;
import com.zhekasmirnov.horizon.runtime.logger.Logger;
import com.zhekasmirnov.innercore.api.dimensions.CustomDimension;
import java.util.ArrayList;
@@ -9,8 +10,9 @@ import java.util.HashMap;
public class FakeDimensions {
private static int CURRENT_FAKE_ID = Integer.MIN_VALUE;
private static HashMap<Integer, Integer> fakeIdForLevelId = new HashMap<>();
private static HashMap<Integer, Level> levelForFakeId = new HashMap<>();
private static final HashMap<Integer, Integer> fakeIdForLevelId = new HashMap<>();
private static final HashMap<Integer, Level> levelForFakeId = new HashMap<>();
private static final ArrayList<Integer> ignore = new ArrayList<>();
public static int getFakeIdForLevel(final Level level){
/*final int dimensionId = level.getDimension();
@@ -19,6 +21,9 @@ public class FakeDimensions {
return dimensionId;
}*/
if(ignore.contains(level.getDimension()))
return level.getDimension();
//Проверка для псевдо-измерений накита
Integer fakeId = fakeIdForLevelId.get(level.getId());
if(fakeId == null){
@@ -33,8 +38,6 @@ public class FakeDimensions {
return fakeId;
}
private static ArrayList<Integer> ignore = new ArrayList<>();
public static void registerIgnore(int id){
ignore.add(id);
levelForFakeId.put(id, null);