summaryrefslogtreecommitdiff
path: root/src/server.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/server.h')
-rw-r--r--src/server.h21
1 files changed, 18 insertions, 3 deletions
diff --git a/src/server.h b/src/server.h
index 50cd5b285..a1d7e5df7 100644
--- a/src/server.h
+++ b/src/server.h
@@ -40,6 +40,23 @@ class IWritableItemDefManager;
class IWritableNodeDefManager;
class IWritableCraftDefManager;
+class ServerError : public std::exception
+{
+public:
+ ServerError(const std::string &s)
+ {
+ m_s = "ServerError: ";
+ m_s += s;
+ }
+ virtual ~ServerError() throw()
+ {}
+ virtual const char * what() const throw()
+ {
+ return m_s.c_str();
+ }
+ std::string m_s;
+};
+
/*
Some random functions
*/
@@ -211,8 +228,6 @@ struct PlayerInfo
void PrintLine(std::ostream *s);
};
-u32 PIChecksum(core::list<PlayerInfo> &l);
-
/*
Used for queueing and sorting block transfers in containers
@@ -608,7 +623,7 @@ private:
{
Player *player = m_env->getPlayer(peer_id);
if(player == NULL)
- return "[id="+itos(peer_id);
+ return "[id="+itos(peer_id)+"]";
return player->getName();
}