summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/changelog.txt3
-rw-r--r--src/server.cpp2
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/changelog.txt b/doc/changelog.txt
index f8fa6b5d7..c2e5b7744 100644
--- 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 b08d568cc..6a0c13040 100644
--- 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);
}