Merge pull request #147 from nikita-edel/dev

enhancement: make LCE runnable with ASan

.gitignore

@@ -29,7 +29,7 @@ meson-logs/
 *.out
 *.d
 compile_commands.json
-
+.clangd
 
 
 # ----- Scratch / legacy -----

Minecraft.Client/Input/ConsoleInputSource.h

@@ -3,6 +3,7 @@
 class  ConsoleInputSource
 {
 public:
+	virtual ~ConsoleInputSource(){}
 	virtual void info(const std::wstring& string) = 0;
     virtual void warn(const std::wstring& string) = 0;
     virtual std::wstring getConsoleName() = 0;

Minecraft.Client/Input/Input.h

@@ -12,6 +12,7 @@ public:
     bool sneaking;
     
 	Input();	// 4J - added
+	virtual ~Input(){}
 
     virtual void tick(LocalPlayer *player);
 
@@ -19,4 +20,4 @@ private:
 	
     bool lReset;
     bool rReset;
-};
+};

Minecraft.Client/Network/PlayerChunkMap.cpp

@@ -33,7 +33,7 @@ PlayerChunkMap::PlayerChunk::PlayerChunk(int x, int z, PlayerChunkMap *pcm) : po
 
 PlayerChunkMap::PlayerChunk::~PlayerChunk()
 {
-	delete changedTiles.data;
+	delete[] changedTiles.data; //4jcraft, changed to []
 }
 
 // 4J added - construct an an array of flags that indicate which entities are still waiting to have network packets sent out to say that they have been removed
@@ -797,4 +797,4 @@ void PlayerChunkMap::setRadius(int newRadius)
 		assert(radius >= MIN_VIEW_DISTANCE);
 		this->radius = newRadius;
 	}
-}
+}

Minecraft.Client/Platform/Common/Consoles_App.cpp

@@ -4111,7 +4111,7 @@ void CMinecraftApp::loadStringTable()
 	{
 		byteArray locFile = m_mediaArchive->getFile(localisationFile);
 		m_stringTable = new StringTable(locFile.data, locFile.length);
-		delete locFile.data;
+		delete[] locFile.data;
 	}
 	else
 	{

Minecraft.Client/Platform/Common/GameRules/ConsoleSchematicFile.cpp

@@ -285,12 +285,12 @@ __int64 ConsoleSchematicFile::applyBlocksAndData(LevelChunk *chunk, AABB *chunkB
 	PIXBeginNamedEvent(0,"Setting Block data");
 	chunk->setBlockData(blockData);
 	PIXEndNamedEvent();
-	delete blockData.data;
+	delete[] blockData.data; //4jcraft changed to array delete
 	chunk->recalcHeightmapOnly();
 	PIXBeginNamedEvent(0,"Setting Data data");
 	chunk->setDataData(dataData);
 	PIXEndNamedEvent();
-	delete dataData.data;
+	delete[] dataData.data; //4jcraft, same here
 
 	// A basic pass through to roughly do the lighting. At this point of post-processing, we don't have all the neighbouring chunks loaded in,
 	// so any lighting here should be things that won't propagate out of this chunk.

Minecraft.Client/Platform/Common/GameRules/GameRuleDefinition.h

@@ -27,6 +27,7 @@ protected:
 
 public:
 	GameRuleDefinition();
+	virtual ~GameRuleDefinition(){}
 
 	virtual ConsoleGameRules::EGameRuleType getActionType() = 0;
 

Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.h

@@ -22,6 +22,7 @@ public:
 	// was being mixed in with all the game information as they have 
 	// completely different lifespans.
 
+	virtual ~GrSource(){}
 	virtual bool requiresTexturePack()=0;
 	virtual UINT getRequiredTexturePackId()=0;
 	virtual std::wstring getDefaultSaveName()=0;

Minecraft.Client/Platform/Common/Tutorial/LookAtEntityHint.h

@@ -14,7 +14,8 @@ private:
 
 public:
 	LookAtEntityHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, int titleId, eINSTANCEOF type);
-	~LookAtEntityHint();
+	//TODO: 4jcraft added, this was not implemented
+	~LookAtEntityHint(){};
 
 	virtual bool onLookAtEntity(eINSTANCEOF type);
-};
+};

Minecraft.Client/Platform/Common/Tutorial/LookAtTileHint.cpp

@@ -10,6 +10,7 @@ LookAtTileHint::LookAtTileHint(eTutorial_Hint id, Tutorial *tutorial, int tiles[
 {
 	m_iTilesCount = tilesLength;
 
+	//TODO: 4jcraft: allocating but never freeing mem, leak
 	m_iTiles= new int [m_iTilesCount];
 	for(unsigned int i=0;i<m_iTilesCount;i++)
 	{
@@ -65,4 +66,4 @@ bool LookAtTileHint::onLookAt(int id,int iData)
 		}
 	}
 	return false;
-}
+}

Minecraft.Client/Platform/Common/Tutorial/LookAtTileHint.h

@@ -16,7 +16,8 @@ private:
 
 public:
 	LookAtTileHint(eTutorial_Hint id, Tutorial *tutorial, int tiles[], unsigned int tilesLength, int iconOverride = -1, int iData=-1, int iDataOverride  = -1);
-	~LookAtTileHint();
+	//TODO: 4jcraft, added, destructor was never implemented
+	~LookAtTileHint(){};
 
 	virtual bool onLookAt(int id, int iData=0);
-};
+};

Minecraft.Client/Platform/Common/Tutorial/TakeItemHint.h

@@ -13,7 +13,8 @@ private:
 
 public:
 	TakeItemHint(eTutorial_Hint id, Tutorial *tutorial, int items[], unsigned int itemsLength);
-	~TakeItemHint();
+	//TODO: 4jcraft, added, it was never implemented
+	virtual ~TakeItemHint(){};
 
 	virtual bool onTake( std::shared_ptr<ItemInstance> item );
-};
+};

Minecraft.Client/Platform/Common/Tutorial/Tutorial.h

@@ -123,7 +123,7 @@ public:
 	bool m_isFullTutorial;
 public:
 	Tutorial(int iPad, bool isFullTutorial = false);
-	~Tutorial();
+	virtual ~Tutorial();
 	void tick();
 
 	int getPad() { return m_iPad; }

Minecraft.Client/Platform/Common/Tutorial/TutorialHint.h

@@ -37,6 +37,7 @@ protected:
 
 public:
 	TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, eHintType type, bool allowFade = true);
+	virtual ~TutorialHint(){}
 
 	eTutorial_Hint getId() { return m_id; }
 
@@ -50,4 +51,4 @@ public:
 	virtual bool onLookAtEntity(eINSTANCEOF type);
 	virtual int tick();
 	virtual bool allowFade() { return m_allowFade; }
-};
+};

Minecraft.Client/Player/MultiPlayerGameMode.h

@@ -23,6 +23,7 @@ protected:
 
 public:
 	MultiPlayerGameMode(Minecraft *minecraft, ClientConnection *connection);
+	virtual ~MultiPlayerGameMode(){}
 	static void creativeDestroyBlock(Minecraft *minecraft, MultiPlayerGameMode *gameMode, int x, int y, int z, int face);
 	void adjustPlayer(std::shared_ptr<Player> player);
 	bool isCutScene();
@@ -64,4 +65,4 @@ public:
 	virtual bool isInputAllowed(int mapping) { return true; }
 	virtual bool isTutorial() { return false; }
 	virtual Tutorial *getTutorial() { return NULL; }
-};
+};

Minecraft.Client/Rendering/EntityRenderers/TileRenderer.cpp

@@ -160,7 +160,7 @@ TileRenderer::TileRenderer( LevelSource* level, int xMin, int yMin, int zMin, un
 
 TileRenderer::~TileRenderer()
 {
-	delete cache;
+	delete[] cache; //4jcraft, changed to []
 }
 
 TileRenderer::TileRenderer( LevelSource* level )

Minecraft.Client/Rendering/Models/Model.h

@@ -19,6 +19,7 @@ public:
 	int texHeight;
 
 	Model();		// 4J added
+	virtual ~Model(){}
 	virtual void render(std::shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled) {}
 	virtual void setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, unsigned int uiBitmaskOverrideAnim=0) {}
 	virtual void prepareMobModel(std::shared_ptr<Mob> mob, float time, float r, float a) {}

Minecraft.Client/Textures/MemTextureProcessor.h

@@ -4,5 +4,6 @@ class BufferedImage;
 class MemTextureProcessor
 {
 public:
+	virtual ~MemTextureProcessor(){}
 	virtual BufferedImage *process(BufferedImage *read) = 0;
-};
+};

Minecraft.Client/Textures/Packs/DLCTexturePack.h

@@ -23,7 +23,7 @@ public:
 	using AbstractTexturePack::getResource;
 
 	DLCTexturePack(DWORD id, DLCPack *pack, TexturePack *fallback);
-	~DLCTexturePack();
+	~DLCTexturePack(){};
 
 	virtual std::wstring getResource(const std::wstring& name);
 	virtual DLCPack * getDLCPack();

Minecraft.Client/Textures/Packs/TexturePack.h

@@ -12,6 +12,7 @@ class TexturePack
 public:
 
 	TexturePack() { m_bHasAudio=false;}
+	virtual ~TexturePack(){}
 	virtual bool hasData() = 0;
 	virtual bool hasAudio() { return m_bHasAudio;}
 	virtual void setHasAudio(bool bVal) {m_bHasAudio=bVal;}	

Minecraft.Client/Textures/Stitching/StitchedTexture.cpp

@@ -60,11 +60,17 @@ void StitchedTexture::freeFrameTextures()
 
 StitchedTexture::~StitchedTexture()
 {
-	for(AUTO_VAR(it, frames->begin()); it != frames->end(); ++it)
-	{
-		delete *it;
+	// 4jcraft, added null check
+	// the constructor does not allocate the frames vector.
+	// in some scenarios the destructor/delete is called 
+	// without ever calling ::init() 
+	if(frames) {
+		for(AUTO_VAR(it, frames->begin()); it != frames->end(); ++it)
+		{
+			delete *it;
+		}
+		delete frames;
 	}
-	delete frames;
 }
 
 void StitchedTexture::initUVs(float U0, float V0, float U1, float V1)
@@ -351,4 +357,4 @@ int StitchedTexture::getFlags() const
 bool StitchedTexture::hasOwnData()
 {
 	return true;
-}
+}

Minecraft.Client/Textures/Stitching/StitchedTexture.h

@@ -86,4 +86,4 @@ public:
 	void setFlags(int flags);		// 4J added
 	virtual void freeFrameTextures();		// 4J added
 	virtual bool hasOwnData();		// 4J Added
-};
+};

Minecraft.Client/Textures/TextureManager.cpp

@@ -193,4 +193,4 @@ Texture *TextureManager::createTexture(const std::wstring &name, int mode, int w
 	// 4J Stu - Don't clamp as it causes issues with how we signal non-mipmmapped textures to the pixel shader
 	//return createTexture(name, mode, width, height, Texture::WM_CLAMP, format, Texture::TFLT_NEAREST, Texture::TFLT_NEAREST, mipmap, NULL);
 	return createTexture(name, mode, width, height, Texture::WM_WRAP, format, Texture::TFLT_NEAREST, Texture::TFLT_NEAREST, mipmap, NULL);
-}
+}

Minecraft.Client/Utils/MemoryTracker.h

@@ -1,5 +1,4 @@
 #pragma once
-#include "MemoryTracker.h"
 class ByteBuffer;
 class IntBuffer;
 class FloatBuffer;

Minecraft.World/AI/Control/JumpControl.h

@@ -12,7 +12,9 @@ private:
 
 public:
 	JumpControl(Mob *mob);
+	virtual ~JumpControl(){}
 
 	void jump();
+	//genuinly, why tf is this VIRTUAL
 	virtual void tick();
-};
+};

Minecraft.World/AI/Control/LookControl.h

@@ -15,6 +15,7 @@ private:
 
 public:
 	LookControl(Mob *mob);
+	virtual ~LookControl(){}
 
 	void setLookAt(std::shared_ptr<Entity> target, float yMax, float xMax);
 	void setLookAt(double x, double y, double z, float yMax, float xMax);
@@ -30,4 +31,4 @@ public:
 	double getWantedX();
 	double getWantedY();
 	double getWantedZ();
-};
+};

Minecraft.World/AI/Control/MoveControl.h

@@ -22,6 +22,7 @@ private:
 
 public:
 	MoveControl(Mob *mob);
+	virtual ~MoveControl(){}
 
 	bool hasWanted();
 	float getSpeed();
@@ -31,4 +32,4 @@ public:
 
 private:
 	float rotlerp(float a, float b, float max);
-};
+};

Minecraft.World/Containers/Container.h

@@ -7,6 +7,7 @@ class Player;
 class Container
 {
 public:
+	virtual ~Container(){}
     static const int LARGE_MAX_STACK_SIZE = 64;
 
     virtual unsigned int getContainerSize() = 0;
@@ -20,4 +21,4 @@ public:
     virtual bool stillValid(std::shared_ptr<Player> player) = 0;
 	virtual void startOpen() = 0;
 	virtual void stopOpen() = 0;
-};
+};

Minecraft.World/Containers/CraftingContainer.h

@@ -13,7 +13,7 @@ private:
 
 public:
 	CraftingContainer(AbstractContainerMenu *menu, unsigned int w, unsigned int h);
-	~CraftingContainer();
+	virtual ~CraftingContainer();
 
 	virtual unsigned int getContainerSize();
 	virtual std::shared_ptr<ItemInstance> getItem(unsigned int slot);
@@ -29,4 +29,4 @@ public:
 	void startOpen() { } // TODO Auto-generated method stub
 	void stopOpen() { } // TODO Auto-generated method stub
 
-};
+};

Minecraft.World/Containers/Merchant.h

@@ -7,6 +7,7 @@ class Player;
 class Merchant
 {
 public:
+	virtual ~Merchant(){}
 	virtual void setTradingPlayer(std::shared_ptr<Player> player) = 0;
 	virtual std::shared_ptr<Player> getTradingPlayer() = 0;
 	virtual MerchantRecipeList *getOffers(std::shared_ptr<Player> forPlayer) = 0;
@@ -14,4 +15,4 @@ public:
 	virtual void notifyTrade(MerchantRecipe *activeRecipe) = 0;
 	virtual void notifyTradeUpdated(std::shared_ptr<ItemInstance> item) = 0;
 	virtual int getDisplayName() = 0;
-};
+};

Minecraft.World/Containers/ResultContainer.h

@@ -10,6 +10,7 @@ private:
 public:
 	// 4J Stu Added a ctor to init items
 	ResultContainer();
+	virtual ~ResultContainer(){}
 
 	virtual unsigned int getContainerSize();
 	virtual std::shared_ptr<ItemInstance> getItem(unsigned int slot);
@@ -23,4 +24,4 @@ public:
 
 	void startOpen() { } // TODO Auto-generated method stub
 	void stopOpen() { } // TODO Auto-generated method stub
-};
+};

Minecraft.World/IO/Streams/BufferedOutputStream.cpp

@@ -15,7 +15,11 @@ BufferedOutputStream::BufferedOutputStream(OutputStream *out, int size)
 
 BufferedOutputStream::~BufferedOutputStream()
 {
-	delete buf.data;
+	//4jcraft, changed to [], deallocates internal buffer
+	//TODO: ArrayWithLength.h doesnt have a destructor.
+	//this wouldnt need to be done manually.
+	//but for some reason the destructor is commented out in the source code?
+	delete[] buf.data; 
 }
 
 //Flushes this buffered output stream. This forces any buffered output bytes to be written out to the underlying output stream.

Minecraft.World/Items/ItemInstance.h

@@ -63,7 +63,7 @@ private:
 	ItemInstance()	{ _init(-1,0,0); }
 
 public:
-	~ItemInstance();
+	virtual ~ItemInstance();
 	std::shared_ptr<ItemInstance> remove(int count);
 
 	Item *getItem() const;
@@ -151,4 +151,4 @@ public:
 
 	int getBaseRepairCost();
 	void setRepairCost(int cost);
-};
+};

Minecraft.World/Items/MapItem.cpp

@@ -342,6 +342,6 @@ std::shared_ptr<Packet> MapItem::getUpdatePacket(std::shared_ptr<ItemInstance> i
 	if (data.data == NULL || data.length == 0) return nullptr;
 
 	std::shared_ptr<Packet> retval = std::shared_ptr<Packet>(new ComplexItemDataPacket((short) Item::map->id, (short) itemInstance->getAuxValue(), data));
-	delete data.data;
+	delete[] data.data; //4jcraft, changed to []
 	return retval;
 }

Minecraft.World/Level/Dimensions/Dimension.h

@@ -28,7 +28,7 @@ protected:
 
 public:
 	Dimension();
-	~Dimension();
+	virtual ~Dimension();
 	virtual ChunkSource *createRandomLevelSource() const;
 	virtual ChunkSource *createFlatLevelSource() const;
     virtual ChunkStorage *createStorage(File dir);

Minecraft.World/Level/LevelChunk.h

@@ -152,7 +152,7 @@ public:
     LevelChunk(Level *level, int x, int z);
     LevelChunk(Level *level, byteArray blocks, int x, int z);
 	LevelChunk(Level *level, int x, int z, LevelChunk *lc);
-	~LevelChunk();
+	virtual ~LevelChunk();
 
     virtual bool isAt(int x, int z);
 

Minecraft.World/Level/LevelData.h

@@ -71,6 +71,7 @@ protected:
 	virtual void setTagData(CompoundTag *tag);		// 4J - removed  CompoundTag *playerTag
 
 public:
+	virtual ~LevelData(){}
 	virtual  __int64 getSeed();
 	virtual  int getXSpawn();
 	virtual  int getYSpawn();

Minecraft.World/Level/Storage/LevelStorage.h

@@ -18,6 +18,7 @@ public:
 	static const std::wstring NETHER_FOLDER;
 	static const std::wstring ENDER_FOLDER;
 
+	virtual ~LevelStorage(){}
     virtual LevelData *prepareLevel() = 0;
     virtual void checkSession() = 0;
     virtual ChunkStorage *createChunkStorage(Dimension *dimension) = 0;

Minecraft.World/Level/Storage/MapItemSavedData.cpp

@@ -123,7 +123,7 @@ charArray MapItemSavedData::HoldingPlayer::nextUpdatePacket(std::shared_ptr<Item
 			memcpy(lastSentDecorations.data, data.data, data.length);
 			return data;
 		}
-		delete data.data;
+		delete[] data.data; //4jcraft, changed to []
 	}
 	std::shared_ptr<ServerPlayer> servPlayer = std::dynamic_pointer_cast<ServerPlayer>(player);
 	for (int d = 0; d < 10; d++)

Minecraft.World/Level/Storage/PlayerIO.h

@@ -19,4 +19,4 @@ public:
 	virtual void saveMapIdLookup() = 0;
 	virtual void deleteMapFilesForPlayer(std::shared_ptr<Player> player) = 0;
 	virtual void saveAllCachedData() = 0;
-};
+};

Minecraft.World/Level/Storage/SavedData.h

@@ -15,6 +15,7 @@ private:
 
 public:
 	SavedData(const std::wstring& id);
+	virtual ~SavedData(){}
 
 	virtual void load(CompoundTag *tag) = 0;
 	virtual void save(CompoundTag *tag) = 0;
@@ -22,4 +23,4 @@ public:
 	void setDirty();
 	void setDirty(bool dirty);
 	bool isDirty();
-};
+};

Minecraft.World/Network/Packets/AwardStatPacket.cpp

@@ -16,7 +16,13 @@ AwardStatPacket::AwardStatPacket(int statId, int count)
 {
 	this->statId = statId;
 
-	this->m_paramData.data = (uint8_t *) new int(count);
+	// 4jcraft, changed from (uint8_t*) new int(count); to:
+	//			 new uint8_t[sizeof(int)];
+	// and memcpy of the integer into the array
+	// reason: operator missmatch, array is deleted with delete[]
+	// and typesafety
+	this->m_paramData.data = new uint8_t[sizeof(int)];
+	memcpy(this->m_paramData.data, &count, sizeof(int));
 	this->m_paramData.length = sizeof(int);
 }
 
@@ -30,7 +36,7 @@ AwardStatPacket::~AwardStatPacket()
 {
 	if (m_paramData.data != NULL) 
 	{
-		delete [] m_paramData.data;
+		delete[] m_paramData.data;
 		m_paramData.data = NULL;
 	}
 }

Minecraft.World/Network/Packets/Packet.h

@@ -32,7 +32,7 @@ public:
 		const int id;
 
 	public:
-		PacketStatistics(int id) : id( id ), count( 0 ), totalSize( 0 ), samplesPos( 0 ), firstSampleTime( 0 ) { countSamples[0] = 0; sizeSamples[0] = 0; }
+		PacketStatistics(int id) : count( 0 ), totalSize( 0 ), samplesPos( 0 ), firstSampleTime( 0 ), id( id ) { countSamples[0] = 0; sizeSamples[0] = 0; }
 		void addPacket(int bytes);
 		int getCount();
 		double getAverageSize();
@@ -61,6 +61,7 @@ public:
 	const __int64 createTime;
 
 	Packet();
+	virtual ~Packet(){}
 
 	static std::shared_ptr<Packet> getPacket(int id);
 
@@ -110,4 +111,4 @@ public:
 
 protected:
 	static void writeNbt(CompoundTag *tag, DataOutputStream *dos);
-};
+};

Minecraft.World/Network/Packets/PacketListener.h

@@ -106,6 +106,7 @@ class GameCommandPacket;
 class PacketListener
 {
 public:
+	virtual ~PacketListener(){}
 	virtual bool isServerPacketListener() = 0;
 	virtual void handleBlockRegionUpdate(std::shared_ptr<BlockRegionUpdatePacket> packet);
 	virtual void onUnhandledPacket(std::shared_ptr<Packet> packet);

Minecraft.World/Network/Packets/RemoveEntitiesPacket.cpp

@@ -16,7 +16,7 @@ RemoveEntitiesPacket::RemoveEntitiesPacket(intArray ids)
 
 RemoveEntitiesPacket::~RemoveEntitiesPacket()
 {
-	delete ids.data;
+	delete[] ids.data; //4jcraft, changed to []
 }
 
 void RemoveEntitiesPacket::read(DataInputStream *dis) //throws IOException 

Minecraft.World/Util/AABB.cpp

@@ -12,14 +12,14 @@ AABB::ThreadStorage *AABB::tlsDefault = NULL;
 
 AABB::ThreadStorage::ThreadStorage()
 {
-	pool = new AABB[POOL_SIZE];
+	pool = new AABB[POOL_SIZE]; //4jcraft, needs to be deleted with delete[]
 	poolPointer = 0;
 }
 
 
 AABB::ThreadStorage::~ThreadStorage()
 {
-	delete pool;
+	delete[] pool; //4jcraft, changed to []
 }
 
 void AABB::CreateNewThreadStorage()

Minecraft.World/Util/Icon.h

@@ -16,6 +16,8 @@ public:
 	static const int  IS_ALPHA_CUT_OUT = 4;
 #endif
 
+	virtual ~Icon() {} // added by 4jcraft, needed for abstract class
+
 	virtual int getX() const = 0;
 	virtual int getY() const = 0;
 	virtual int getWidth() const = 0;

Minecraft.World/WorldGen/Biomes/BiomeDecorator.h

@@ -24,6 +24,8 @@ protected:
 
 public:
 	BiomeDecorator(Biome *biome);
+	virtual ~BiomeDecorator(){}
+
 
 	void decorate(Level *level, Random *random, int xo, int zo);
 
@@ -72,4 +74,4 @@ protected:
 	void decorateDepthSpan(int count, Feature *feature, int y0, int y1);
 	void decorateDepthAverage(int count, Feature *feature, int yMid, int ySpan);
 	void decorateOres();
-};
+};

Minecraft.World/WorldGen/Biomes/BiomeSource.cpp

@@ -218,7 +218,7 @@ void BiomeSource::getBiomeBlock(BiomeArray& biomes, int x, int z, int w, int h,
 	{
 		BiomeArray tmp = cache->getBiomeBlockAt(x, z);
 		System::arraycopy(tmp, 0, &biomes, 0, w * h);
-		delete tmp.data;	// MGH - added, the caching creates this array from the indices now.
+		delete[] tmp.data;	// MGH - added, the caching creates this array from the indices now. //4jcraft made it array delete
 		//return biomes;
 	}
 
@@ -635,4 +635,4 @@ bool BiomeSource::getIsMatch(float *frac)
 
 	// Consider as suitable if we've got all the critical ones, and in total 9 or more - currently there's 8 critical so this just forces at least 1 more others
 	return ( typeCount >= 9 );
-}
+}

Minecraft.World/WorldGen/Biomes/BiomeSource.h

@@ -40,7 +40,7 @@ public:
 #else
 	static __int64 findSeed(LevelType *generator);	// 4J added
 #endif
-	~BiomeSource();
+	virtual ~BiomeSource();
 
 public:
 	std::vector<Biome *> getPlayerSpawnBiomes() { return playerSpawnBiomes; }

Minecraft.World/WorldGen/Features/HouseFeature.cpp

@@ -7,9 +7,9 @@
 
 bool HouseFeature::place(Level *level, Random *random, int x, int y, int z)
 {
-    while (y > 0 && !level->getMaterial(x, y - 1, z)->blocksMotion())
+    while (y > 0 && !level->getMaterial(x, y - 1, z)->blocksMotion()) {
         y--;
-
+    }
 	int w = random->nextInt(7) + 7;
 	int h = 4 + random->nextInt(3) / 2;
 	int d = random->nextInt(7) + 7;
@@ -190,4 +190,4 @@ bool HouseFeature::place(Level *level, Random *random, int x, int y, int z)
 
     return true;
 
-}
+}

Minecraft.World/WorldGen/Features/LakeFeature.cpp

@@ -13,8 +13,9 @@ bool LakeFeature::place(Level *level, Random *random, int x, int y, int z)
 {
     x -= 8;
     z -= 8;
-    while (y > 5 && level->isEmptyTile(x, y, z))
+    while (y > 5 && level->isEmptyTile(x, y, z)) {
         y--;
+    }
 	if (y <= 4)
 	{
 		return false;
@@ -172,4 +173,4 @@ bool LakeFeature::place(Level *level, Random *random, int x, int y, int z)
     }
 
     return true;
-}
+}

Minecraft.World/WorldGen/Features/LargeFeature.h

@@ -14,10 +14,10 @@ protected:
 
 public:
 	LargeFeature();
-	~LargeFeature();
+	virtual ~LargeFeature();
 
     virtual void apply(ChunkSource *ChunkSource, Level *level, int xOffs, int zOffs, byteArray blocks);
 
 protected:
 	virtual void addFeature(Level *level, int x, int z, int xOffs, int zOffs, byteArray blocks) {}
-};
+};

Minecraft.World/WorldGen/Features/TreeFeature.h

@@ -5,9 +5,9 @@ class TreeFeature : public Feature
 {
 private:
 	const int baseHeight;
-	const bool addJungleFeatures;
 	const int trunkType;
 	const int leafType;
+	const bool addJungleFeatures;
 
 public:
 	TreeFeature(bool doUpdate);

Minecraft.World/WorldGen/Layers/BiomeOverrideLayer.cpp

@@ -22,7 +22,7 @@ BiomeOverrideLayer::BiomeOverrideLayer(int seedMixup) : Layer(seedMixup)
 #endif
 	if( file == INVALID_HANDLE_VALUE )
 	{
-		DWORD error = GetLastError();
+		// DWORD error = GetLastError();
 		//assert(false);
 		app.DebugPrintf("Biome override not found, using plains as default\n");
 
@@ -78,4 +78,4 @@ intArray BiomeOverrideLayer::getArea(int xo, int yo, int w, int h)
 		}
 	}
 	return result;
-}
+}

Minecraft.World/WorldGen/Layers/Layer.h

@@ -24,6 +24,7 @@ public:
 	static LayerArray getDefaultLayers(__int64 seed, LevelType *levelType);
 
 	Layer(__int64 seedMixup);
+	virtual ~Layer(){}
 
 	virtual void init(__int64 seed);
 	virtual void initRandom(__int64 x, __int64 y);
@@ -33,4 +34,4 @@ protected:
 
 public:
 	virtual intArray getArea(int xo, int yo, int w, int h) = 0;
-};
+};

Minecraft.World/WorldGen/Noise/Synth.h

@@ -3,6 +3,7 @@ class Synth
 {
 public:
     virtual double getValue(double x, double y) = 0;
+    virtual ~Synth(){}
 
     doubleArray create(int width, int height);
 };

Minecraft.World/WorldGen/Sources/TheEndLevelRandomLevelSource.cpp

@@ -188,7 +188,8 @@ LevelChunk *TheEndLevelRandomLevelSource::getChunk(int xOffs, int zOffs)
     levelChunk->recalcHeightmap();
 
 	//delete blocks.data; // Don't delete the blocks as the array data is actually owned by the chunk now
-	delete biomes.data;
+	//4jcraft changed to []
+	delete[] biomes.data;
 
     return levelChunk;
 }

Minecraft.World/WorldGen/Structures/StrongholdPieces.h

@@ -39,6 +39,7 @@ private:
 		int maxPlaceCount;
 		
 		PieceWeight(EPieceClass pieceClass, int weight, int maxPlaceCount);
+		virtual ~PieceWeight(){}
 		virtual bool doPlace(int depth);
 		bool isValid();
     };

meson.build

@@ -52,4 +52,4 @@ subdir('4J.Profile')
 subdir('4J.Storage')
 subdir('Minecraft.Assets')
 subdir('Minecraft.World')
-subdir('Minecraft.Client')
+subdir('Minecraft.Client')