Merge branch 'smartcmd:main' into main

1 files changed, 33 insertions, 33 deletions

diff --git a/Minecraft.World/Material.cpp b/Minecraft.World/Material.cpp
index 9e201ad5..d17965df 100644
--- a/Minecraft.World/Material.cpp
+++ b/Minecraft.World/Material.cpp
@@ -6,39 +6,39 @@
 #include "PortalMaterial.h"
 #include "WebMaterial.h"// 4J added, Java version just does a local alteration when instantiating the Material for webs to get the same thing
 
-Material *Material::air = NULL;
-Material *Material::grass = NULL;
-Material *Material::dirt = NULL;
-Material *Material::wood = NULL;
-Material *Material::stone = NULL;
-Material *Material::metal = NULL;
-Material *Material::heavyMetal = NULL;
-Material *Material::water = NULL;
-Material *Material::lava = NULL;
-Material *Material::leaves = NULL;
-Material *Material::plant = NULL;
-Material *Material::replaceable_plant = NULL;
-Material *Material::sponge = NULL;
-Material *Material::cloth = NULL;
-Material *Material::fire = NULL;
-Material *Material::sand = NULL;
-Material *Material::decoration = NULL;
-Material *Material::clothDecoration = NULL;
-Material *Material::glass = NULL;
-Material *Material::buildable_glass = NULL;
-Material *Material::explosive = NULL;
-Material *Material::coral = NULL;
-Material *Material::ice = NULL;
-Material *Material::topSnow = NULL;
-Material *Material::snow = NULL;
-Material *Material::cactus = NULL;
-Material *Material::clay = NULL;
-Material *Material::vegetable = NULL;
-Material *Material::egg = NULL;
-Material *Material::portal = NULL;
-Material *Material::cake = NULL;
-Material *Material::piston = NULL;
-Material *Material::web = NULL;
+Material *Material::air = nullptr;
+Material *Material::grass = nullptr;
+Material *Material::dirt = nullptr;
+Material *Material::wood = nullptr;
+Material *Material::stone = nullptr;
+Material *Material::metal = nullptr;
+Material *Material::heavyMetal = nullptr;
+Material *Material::water = nullptr;
+Material *Material::lava = nullptr;
+Material *Material::leaves = nullptr;
+Material *Material::plant = nullptr;
+Material *Material::replaceable_plant = nullptr;
+Material *Material::sponge = nullptr;
+Material *Material::cloth = nullptr;
+Material *Material::fire = nullptr;
+Material *Material::sand = nullptr;
+Material *Material::decoration = nullptr;
+Material *Material::clothDecoration = nullptr;
+Material *Material::glass = nullptr;
+Material *Material::buildable_glass = nullptr;
+Material *Material::explosive = nullptr;
+Material *Material::coral = nullptr;
+Material *Material::ice = nullptr;
+Material *Material::topSnow = nullptr;
+Material *Material::snow = nullptr;
+Material *Material::cactus = nullptr;
+Material *Material::clay = nullptr;
+Material *Material::vegetable = nullptr;
+Material *Material::egg = nullptr;
+Material *Material::portal = nullptr;
+Material *Material::cake = nullptr;
+Material *Material::piston = nullptr;
+Material *Material::web = nullptr;
 
 void Material::staticCtor()
 {