Make DummyWorld singleton.

This commit is contained in:
Matthew Messinger 2018-08-22 18:19:27 -04:00
parent 0ef8f810d7
commit 6ef13d9e9a
2 changed files with 30 additions and 27 deletions

View file

@ -13,34 +13,38 @@ import net.minecraft.world.storage.WorldInfo;
public class DummyWorld extends World {
public DummyWorld() {
super(null, new WorldInfo(
new WorldSettings(0, GameType.NOT_SET, false, false, WorldType.DEFAULT), "MpServer"),
new WorldProviderSurface(), null, true);
}
public static final World INSTANCE = new DummyWorld();
@Override
protected IChunkProvider createChunkProvider() {
return null;
}
private DummyWorld() {
super(null,
new WorldInfo(new WorldSettings(0, GameType.NOT_SET, false, false, WorldType.DEFAULT), "MpServer"),
new WorldProviderSurface(),
null,
true);
}
@Override
protected boolean isChunkLoaded(int x, int z, boolean allowEmpty) {
return true;
}
@Override
protected IChunkProvider createChunkProvider() {
return null;
}
@Override
public IBlockState getBlockState(BlockPos pos) {
return Blocks.AIR.getDefaultState();
}
@Override
protected boolean isChunkLoaded(int x, int z, boolean allowEmpty) {
return true;
}
@Override
public float getLightBrightness(BlockPos pos) {
return 1;
}
@Override
public IBlockState getBlockState(BlockPos pos) {
return Blocks.AIR.getDefaultState();
}
@Override
public BlockPos getSpawnPoint() {
return BlockPos.ORIGIN;
}
@Override
public float getLightBrightness(BlockPos pos) {
return 1;
}
@Override
public BlockPos getSpawnPoint() {
return BlockPos.ORIGIN;
}
}

View file

@ -7,7 +7,6 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
import com.voxelmodpack.hdskins.LocalTexture;
import com.voxelmodpack.hdskins.LocalTexture.IBlankSkinSupplier;
import com.voxelmodpack.hdskins.SkinUploader;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.SkinManager;
import net.minecraft.entity.EntityLivingBase;
@ -43,7 +42,7 @@ public class EntityPlayerModel extends EntityLivingBase implements IBlankSkinSup
protected boolean previewThinArms = false;
public EntityPlayerModel(GameProfile gameprofile) {
super(new DummyWorld());
super(DummyWorld.INSTANCE);
profile = gameprofile;