Merge branch 'testing'

Conflicts:
	src/account-server/storage.cpp
	src/game-server/being.cpp
	src/game-server/being.hpp
	src/game-server/character.cpp
	src/game-server/character.hpp
	src/game-server/gamehandler.cpp
	src/game-server/inventory.cpp
	src/scripting/lua.cpp
	src/sql/mysql/createTables.sql
	src/sql/sqlite/createTables.sql

1 files changed, 12 insertions, 4 deletions

diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp
index a6cf21f0..c68cb623 100644
--- a/src/account-server/serverhandler.cpp
+++ b/src/account-server/serverhandler.cpp
@@ -116,6 +116,7 @@ NetComputer *ServerHandler::computerConnected(ENetPeer *peer)
 
 void ServerHandler::computerDisconnected(NetComputer *comp)
 {
+    LOG_INFO("Game-server disconnected.");
     delete comp;
 }
 
@@ -562,10 +563,17 @@ void GameServerHandler::syncDatabase(MessageIn &msg)
                 int CharId = msg.readLong();
                 int CharPoints = msg.readLong();
                 int CorrPoints = msg.readLong();
-                int AttribId = msg.readByte();
-                int AttribValue = msg.readLong();
-                storage->updateCharacterPoints(CharId, CharPoints, CorrPoints,
-                                               AttribId, AttribValue);
+                storage->updateCharacterPoints(CharId, CharPoints, CorrPoints);
+            } break;
+
+            case SYNC_CHARACTER_ATTRIBUTE:
+            {
+                LOG_DEBUG("received SYNC_CHARACTER_ATTRIBUTE");
+                int    charId = msg.readLong();
+                int    attrId = msg.readLong();
+                double base   = msg.readDouble();
+                double mod    = msg.readDouble();
+                storage->updateAttribute(charId, attrId, base, mod);
             } break;
 
             case SYNC_CHARACTER_SKILL: