Merge branch 'master' into CentOS7

server/barriers/barrier_data.cpp

@@ -62,6 +62,7 @@ int BarrierData::Update(lua_State* L) {
 		}
 
 		ret += lua_tonumber(L, -1);
+		lua_pop(L, 1);
 	}
 
 	Entity::Update();

server/creatures/creature_data.cpp

@@ -55,6 +55,7 @@ int CreatureData::Update(lua_State* L) {
 		}
 
 		ret += lua_tonumber(L, -1);
+		lua_pop(L, 1);
 	}
 
 	Entity::Update();

server/rooms/room_data.cpp

@@ -213,7 +213,7 @@ void RoomData::RunFrameCharacterBarrierCollisions() {
 
 
 				//DEBUG: output barrierIndex, battleIndex
-				std::cout << barrierIt.first << "\t" << barrierIt.second.GetBattleIndex() << std::endl;
+//				std::cout << barrierIt.first << "\t" << barrierIt.second.GetBattleIndex() << std::endl;
 
 				//Send the entry message to the client
 				BarrierPacket newPacket;