Merge branch 'master' of git://github.com/jgrip/mineserver

src/mineserver.cpp

@@ -182,7 +182,7 @@ int Mineserver::Run(int argc, char *argv[])
 
   if(m_socketlisten < 0)
   {
-    fprintf(stderr, "Failed to create listen socket\n");
+    std::cerr << "Failed to create listen socket" << std::endl;
     return 1;
   }
 
@@ -197,13 +197,13 @@ int Mineserver::Run(int argc, char *argv[])
   //Bind to port
   if(bind(m_socketlisten, (struct sockaddr *)&addresslisten, sizeof(addresslisten)) < 0)
   {
-    fprintf(stderr, "Failed to bind\n");
+    std::cerr << "Failed to bind" << std::endl;
     return 1;
   }
 
   if(listen(m_socketlisten, 5) < 0)
   {
-    fprintf(stderr, "Failed to listen to socket\n");
+    std::cerr << "Failed to listen to socket" << std::endl;
     return 1;
   }
 

src/nbt.cpp

@@ -231,6 +231,8 @@ NBT_Value::NBT_Value(eTAG_Type type, uint8 **buf, int &remaining) : m_type(type)
       (*m_value.compoundVal)[key] = new NBT_Value((eTAG_Type)type, buf, remaining);
     }
     break;
+  case TAG_END:
+    break;
   }
 }
 
@@ -587,6 +589,8 @@ void NBT_Value::Write(std::vector<uint8> &buffer)
       buffer.push_back(TAG_END);
       break;
     }
+  case TAG_END:
+    break; //for completeness
   }
 }
 

src/packets.h

@@ -216,7 +216,7 @@ class Packet
   {
     uint32 nval;
     memcpy(&nval, &val , 4);
-    htonl(nval);
+    nval = htonl(nval);
     addToWrite(&nval, 4);
     return *this;
   }