fixing

diff --git a/doc/changelog.txt b/doc/changelog.txt
index f8fa6b5d7a28d381778a1971a7cb5f3be58d1650..c2e5b7744624094f1400f6831d820fa8dd0c1bdb 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,9 @@ Minetest-c55 changelog
 This should contain all the major changes.
 For minor stuff, refer to the commit log of the repository.
 
+2011-04-11:
+- Fixed crafting a bit
+
 2011-04-10_0:
 - Asynchronous map generation
 - New object system

diff --git a/src/server.cpp b/src/server.cpp
index b08d568cc04798cfb83f4513119d725e93c9a850..6a0c1304053016b12a53a0c27dd0b7aba13a0da8 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1224,6 +1224,8 @@ void Server::AsyncRunStep()
                                //u16 peer_id = i.getNode()->getKey();
                                RemoteClient *client = i.getNode()->getValue();
                                Player *player = m_env.getPlayer(client->peer_id);
+                               if(player==NULL)
+                                       continue;
                                std::cout<<player->getName()<<"\t";
                                client->PrintInfo(std::cout);
                        }