Merge branch 'smartcmd:main' into main

1 files changed, 2 insertions, 4 deletions

diff --git a/Minecraft.World/Fireball.cpp b/Minecraft.World/Fireball.cpp
index 1d9fbdda..2a538b06 100644
--- a/Minecraft.World/Fireball.cpp
+++ b/Minecraft.World/Fireball.cpp
@@ -200,11 +200,9 @@ void Fireball::tick()
     shared_ptr<Entity> hitEntity = nullptr;
     vector<shared_ptr<Entity> > *objects = level->getEntities(shared_from_this(), bb->expand(xd, yd, zd)->grow(1, 1, 1));
     double nearest = 0;
-	AUTO_VAR(itEnd, objects->end());
-	for (AUTO_VAR(it, objects->begin()); it != itEnd; it++)
+	for ( auto& e : *objects )
 	{
-        shared_ptr<Entity> e = *it; //objects->at(i);
-        if (!e->isPickable() || (e->is(owner) )) continue; //4J Stu - Never collide with the owner (Enderdragon) // && flightTime < 25)) continue;
+        if ( e == nullptr || !e->isPickable() || (e->is(owner) )) continue; //4J Stu - Never collide with the owner (Enderdragon) // && flightTime < 25)) continue;
 
         float rr = 0.3f;
         AABB *bb = e->bb->grow(rr, rr, rr);