Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 30 insertions, 30 deletions

diff --git a/Minecraft.World/PickaxeItem.cpp b/Minecraft.World/PickaxeItem.cpp
index 5876b9bb..05177e7b 100644
--- a/Minecraft.World/PickaxeItem.cpp
+++ b/Minecraft.World/PickaxeItem.cpp
@@ -2,37 +2,37 @@
 #include "net.minecraft.world.level.tile.h"
 #include "PickaxeItem.h"
 
-TileArray *PickaxeItem::diggables = NULL;
+TileArray PickaxeItem::diggables;
 
 void PickaxeItem::staticCtor()
 {
-	PickaxeItem::diggables = new TileArray( PICKAXE_DIGGABLES);
-	diggables->data[0] = Tile::stoneBrick;
-	diggables->data[1] = Tile::stoneSlab;
-	diggables->data[2] = Tile::stoneSlabHalf;
-	diggables->data[3] = Tile::rock;
-	diggables->data[4] = Tile::sandStone;
-	diggables->data[5] = Tile::mossStone;
-	diggables->data[6] = Tile::ironOre;
-	diggables->data[7] = Tile::ironBlock;
-	diggables->data[8] = Tile::coalOre;
-	diggables->data[9] = Tile::goldBlock;
-	diggables->data[10] = Tile::goldOre;
-	diggables->data[11] = Tile::diamondOre;
-	diggables->data[12] = Tile::diamondBlock;
-	diggables->data[13] = Tile::ice;
-	diggables->data[14] = Tile::hellRock;
-	diggables->data[15] = Tile::lapisOre;
-	diggables->data[16] = Tile::lapisBlock;
-	// 4J - brought forward from 1.2.3
-	diggables->data[17] = Tile::redStoneOre;
-	diggables->data[18] = Tile::redStoneOre_lit;
-	diggables->data[19] = Tile::rail;
-	diggables->data[20] = Tile::detectorRail;
-	diggables->data[21] = Tile::goldenRail;
+	PickaxeItem::diggables = TileArray( PICKAXE_DIGGABLES);
+	diggables.data[0] = Tile::cobblestone;
+	diggables.data[1] = Tile::stoneSlab;
+	diggables.data[2] = Tile::stoneSlabHalf;
+	diggables.data[3] = Tile::stone;
+	diggables.data[4] = Tile::sandStone;
+	diggables.data[5] = Tile::mossyCobblestone;
+	diggables.data[6] = Tile::ironOre;
+	diggables.data[7] = Tile::ironBlock;
+	diggables.data[8] = Tile::coalOre;
+	diggables.data[9] = Tile::goldBlock;
+	diggables.data[10] = Tile::goldOre;
+	diggables.data[11] = Tile::diamondOre;
+	diggables.data[12] = Tile::diamondBlock;
+	diggables.data[13] = Tile::ice;
+	diggables.data[14] = Tile::netherRack;
+	diggables.data[15] = Tile::lapisOre;
+	diggables.data[16] = Tile::lapisBlock;
+	diggables.data[17] = Tile::redStoneOre;
+	diggables.data[18] = Tile::redStoneOre_lit;
+	diggables.data[19] = Tile::rail;
+	diggables.data[20] = Tile::detectorRail;
+	diggables.data[21] = Tile::goldenRail;
+	diggables.data[21] = Tile::activatorRail;
 }
 
-PickaxeItem::PickaxeItem(int id, const Tier *tier) : DiggerItem(id, 2, tier, diggables)
+PickaxeItem::PickaxeItem(int id, const Tier *tier) : DiggerItem(id, 2, tier, &diggables)
 {
 }
 
@@ -54,9 +54,9 @@ bool PickaxeItem::canDestroySpecial(Tile *tile)
 // 4J - brought forward from 1.2.3
 float PickaxeItem::getDestroySpeed(shared_ptr<ItemInstance> itemInstance, Tile *tile)
 {
-    if (tile != NULL && (tile->material == Material::metal || tile->material == Material::heavyMetal || tile->material == Material::stone))
+	if (tile != NULL && (tile->material == Material::metal || tile->material == Material::heavyMetal || tile->material == Material::stone))
 	{
-        return speed;
-    }
-    return DiggerItem::getDestroySpeed(itemInstance, tile);
+		return speed;
+	}
+	return DiggerItem::getDestroySpeed(itemInstance, tile);
 }